# # ChangeLog for trunk/src/org/openstreetmap/josm/command in josm # # Generated by Trac 1.6 # 2024-03-28T10:48:20+01:00 Fri, 11 Dec 2009 21:39:45 GMT mjulius [2611] * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) fixes #4104 - reversing of way does not update direction dependent roles Fri, 04 Dec 2009 14:53:55 GMT Gubaer [2569] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.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) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.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/UploadStrategy.java (added) * trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (added) * trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (added) * trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.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/UploadStrategySelectionPanelTest.java (added) fixed #3684: Add "chunked" upload mode Removed support for API "0.5" ... Thu, 03 Dec 2009 19:26:00 GMT Gubaer [2565] * trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.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/data/osm/BackreferencedDataSet.java (deleted) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (added) * trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (deleted) * trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) Removed BackReferenceDataSet and CollectBackReferenceVisitor because ... Fri, 27 Nov 2009 20:46:49 GMT jttt [2521] * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified) Fixed #3704 Relation memberships are not handled at all when a way ... 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, ... Sat, 21 Nov 2009 22:03:24 GMT stoecker [2495] * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) don't translate assertions Tue, 17 Nov 2009 16:33:31 GMT stoecker [2468] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) remove ViewID, fix typo, i18n update Tue, 10 Nov 2009 21:12:49 GMT Gubaer [2435] * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) see #3892: can't reproduce but added two assert statement in case it ... Sun, 08 Nov 2009 18:55:39 GMT Gubaer [2414] * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.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/BackreferencedDataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) Removed methods made @deprecated in r2411. Sun, 08 Nov 2009 14:19:50 GMT jttt [2410] * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.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/Way.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) Add clearId parameter to primitives copy constructor, replace some ... Sat, 07 Nov 2009 19:28:14 GMT jttt [2405] * trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.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/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/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WayData.java (modified) Save reference to dataset in OsmPrimitive 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 ... 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, 29 Oct 2009 18:48:49 GMT Gubaer [2349] * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) applied #3787: patch by hansendc: Select duplicated objects Tue, 27 Oct 2009 18:03:58 GMT Gubaer [2333] * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) fixed #3753: Merging the ends of two node ways produces corrupt way Mon, 26 Oct 2009 14:23:39 GMT Gubaer [2323] * 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/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/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DeleteAction.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/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExitAction.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/HistoryInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/InfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.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/MirrorAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/NewAction.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/PreferencesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RedoAction.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/SaveAsAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UndoAction.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/UploadSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) Added explicit help topics See also ... Sun, 25 Oct 2009 11:05:31 GMT Gubaer [2308] * trunk/images/help/home.png (modified) * trunk/images/help/internet.png (modified) * trunk/images/help/next.png (modified) * trunk/images/help/previous.png (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.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/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/actionsupport (added) * trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.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 (added) * trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java (added) * trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java (added) * trunk/src/org/openstreetmap/josm/gui/help/help-browser.css (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (modified) * trunk/src/org/openstreetmap/josm/tools/WikiReader.java (modified) fixed #3762: Deleted relation still referenced when deleting former ... Sat, 24 Oct 2009 19:22:49 GMT jttt [2305] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/JosmAction.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/PasteTagsAction.java (modified) * trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (added) * 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/NodeData.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/PrimitiveDeepCopy.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/RelationMemberData.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/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WayData.java (modified) Use PrimitiveData for Copy, Paste and Paste tags actions Sat, 24 Oct 2009 05:30:45 GMT Gubaer [2301] * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.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/RelationListDialog.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/help/HelpUtil.java (moved) * trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) fixed #3765: Unable to resolve conflict Improved warning message for ... Sat, 17 Oct 2009 13:40:11 GMT stoecker [2296] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) see #3703 - patch by Daeron - deleting way segment cleanup Tue, 13 Oct 2009 17:40:21 GMT jttt [2284] * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/NodeData.java (added) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (added) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationData.java (added) * trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (added) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WayData.java (added) Added PrimitiveData classes. Uses PrimitiveData as storage for ... Sun, 11 Oct 2009 14:37:08 GMT jttt [2273] * trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.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/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/CreateOsmChangeVisitor.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/gui/DefaultNameFormatter.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/conflict/pair/nodes/NodeListMergeModel.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/dialogs/HistoryDialog.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/ParentRelationLoadingTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.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/OsmServerBackreferenceReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) Replace testing for id <= 0 with isNew() method 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 15:42:18 GMT stoecker [2183] * trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (modified) another typo 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, 20 Sep 2009 16:46:54 GMT Gubaer [2173] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) see #3557: Nodes not linked to their ways after combine (was: when ... Sun, 20 Sep 2009 12:09:52 GMT Gubaer [2171] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) applied #3555: patch by Claudius Henrichs: More typos and closing ... Sun, 20 Sep 2009 09:07:46 GMT stoecker [2166] * trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.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/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) see #3475 - patch by Petr DlouhĂ˝ - improve speed Sun, 20 Sep 2009 08:23:22 GMT stoecker [2163] * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.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/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified) fixed typos Sun, 06 Sep 2009 21:07:33 GMT Gubaer [2070] * trunk/src/org/openstreetmap/josm/Main.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/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.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/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.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/UnGlueAction.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/command/ChangeRelationMemberRoleCommand.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/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/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/osm/Changeset.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/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationMember.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/User.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/MergeVisitor.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/OsmPrimitivRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.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/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombineWaysConflictResolverDialog.java (added) * 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 (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (added) * 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/RelationListDialog.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/MemberTableCellRenderer.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/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/RelationTree.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java (modified) * trunk/src/org/openstreetmap/josm/gui/util (added) * trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java (added) * trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified) * trunk/src/org/openstreetmap/josm/io/FileImporter.java (modified) * trunk/src/org/openstreetmap/josm/io/IllegalDataException.java (added) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.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/OsmServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.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/tools/WindowGeometry.java (modified) new: rewrite of CombineWay action new: conflict resolution dialog ... Fri, 04 Sep 2009 15:44:20 GMT Gubaer [2054] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) applied #3389: patch by podolsir: "delete confirmation" message ... Thu, 03 Sep 2009 13:13:20 GMT Gubaer [2039] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapStatus.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/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified) applied #3377: patch by xeen: Less warnings for JOSM Wed, 02 Sep 2009 19:37:18 GMT Gubaer [2026] * trunk/images/cursor/modifier/delete_node.png (added) * trunk/images/cursor/modifier/delete_segment.png (added) * trunk/images/cursor/modifier/delete_way_node_only.png (added) * trunk/images/cursor/modifier/delete_way_normal.png (added) * trunk/images/cursor/modifier/delete_way_only.png (added) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) applied #2163: patch by xeen: for delete-command mouse-icons Wed, 02 Sep 2009 19:17:52 GMT Gubaer [2025] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java (modified) * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExitAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/InfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.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/mapmode/DrawAction.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/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/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/data/APIDataSet.java (added) * 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/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/CreateOsmChangeVisitor.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/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainApplication.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/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) * trunk/src/org/openstreetmap/josm/gui/SelectionManager.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/relation/ReferringRelationsBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/io (added) * trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (added) * trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/io/FlagCellEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (added) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (added) * trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (added) * trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java (added) * 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/progress/PleaseWaitProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/ProgressRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (added) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmImporter.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/tools/PlatformHookOsx.java (modified) new: improved dialog for uploading/saving modified layers on exit ... 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 ... Sun, 30 Aug 2009 13:41:28 GMT Gubaer [2008] * trunk/images/dialogs/conflict/tagconflictresolved (added) * trunk/images/dialogs/conflict/tagconflictresolved.png (added) * trunk/images/dialogs/conflict/tagconflictunresolved (added) * trunk/images/dialogs/conflict/tagconflictunresolved.png (added) * trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Tag.java (added) * trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java (added) * trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (added) new: tag conflict resolution when pasting tags (only if necessary) ... Sun, 23 Aug 2009 20:37:39 GMT Gubaer [1990] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.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/ConflictAddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.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/coor/CoordinateFormat.java (added) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java (added) * 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/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (added) * trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) * trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java (deleted) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.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/MemberTableMemberCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI ... Sun, 23 Aug 2009 17:34:25 GMT Gubaer [1989] * 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/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.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/data/osm/OsmPrimitiveType.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.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/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative ... 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 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 18:07:43 GMT jttt [1937] * 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/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationMember.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/gui/dialogs/ConflictDialog.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) Replace some occurrences of RelationMember.member with getters Sat, 08 Aug 2009 15:41:01 GMT Gubaer [1936] * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) applied #3221: patch by Daeron : Small cleanup for translation Sat, 08 Aug 2009 09:59:13 GMT jttt [1930] * 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/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/data/osm/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellEditor.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/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionCache.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) Replace RelationMember.role with RelationMember.getRole() and ... 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() Fri, 07 Aug 2009 21:22:31 GMT jttt [1924] * trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.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/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) Made OsmPrimitive.keys deprecated, removed remaining references in JOSM 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 Mon, 03 Aug 2009 13:00:34 GMT Gubaer [1894] * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.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) fixed #3158: modify status is not removed for partial uploads Mon, 27 Jul 2009 19:09:44 GMT jttt [1862] * 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/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/JoinNodeWayAction.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/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.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/mapmode/SelectAction.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/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/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/tools/CopyList.java (added) Way refactoring - added method that will in future replace public ... 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 ... Sun, 26 Jul 2009 15:03:00 GMT Gubaer [1856] * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.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/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (added) * 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) improved deleting relations Sat, 25 Jul 2009 14:34:55 GMT Gubaer [1838] * trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (moved) * trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java (added) * 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/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) new: two utility classes in GUI subsystem: OptionPaneUtil and ... Fri, 24 Jul 2009 09:19:32 GMT stoecker [1826] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) fixed exception 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, 12 Jul 2009 11:18:56 GMT stoecker [1774] * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) i18n fix Sat, 11 Jul 2009 11:17:55 GMT stoecker [1766] * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) fixed i18n issues 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, ... Sat, 04 Jul 2009 12:04:08 GMT stoecker [1728] * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) fixed #2804 - move mode not working Fri, 03 Jul 2009 10:33:32 GMT stoecker [1722] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.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/data/Bounds.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (added) * 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/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.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 (added) * trunk/src/org/openstreetmap/josm/gui/MapMover.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/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) * trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) Large rework in projection handling - now allows only switching and ... Tue, 23 Jun 2009 20:03:37 GMT Gubaer [1690] * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.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/data/osm/DataSet.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/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/properties/OperationCancelledException.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.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/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (added) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) new: MultiFetchServerObjectReader using APIs Multi Fetch method ... Sat, 20 Jun 2009 07:31:00 GMT Gubaer [1682] * trunk/.settings/org.eclipse.jdt.ui.prefs (modified) * trunk/build.xml (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (deleted) * trunk/src/org/openstreetmap/josm/data/conflict (deleted) * trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (deleted) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) removed old conflict resolution code fixed bug in OsmApi (missing ... Wed, 17 Jun 2009 07:02:25 GMT stoecker [1676] * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified) fix typos 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 ... Mon, 08 Jun 2009 19:30:19 GMT Gubaer [1656] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) fixed #2707: Deleting a way with new nodes produces invalid osm file 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 ... Sat, 06 Jun 2009 14:25:25 GMT Gubaer [1642] * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * 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/nodes/NodeListColumnModel.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/RelationMemberListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java (moved) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) added row numbers and synchronized scrolling in conflict resolution ... Sat, 06 Jun 2009 12:30:21 GMT stoecker [1640] * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.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/JoinNodeWayAction.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/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/DeleteCommand.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/data/conflict/PositionConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.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/conflict/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.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/OsmWriter.java (modified) little bit more refactoring of coordinate access - patch by jttt Sat, 06 Jun 2009 11:38:32 GMT stoecker [1636] * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.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/data/conflict/PositionConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) fix #2302 - patch by jttt - some code cleanup for better encapsulation 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. Sun, 24 May 2009 10:21:41 GMT stoecker [1617] * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (added) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) fix #2645 - patch by Teemu Koskinen - cleanup relation role handling ... Mon, 06 Apr 2009 18:18:48 GMT framm [1523] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.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/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.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/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java (added) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.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/CreateOsmChangeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainApplication.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/DiffResultReader.java (modified) * trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/MyHttpHandler.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (added) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * 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/OsmTransferCancelledException.java (added) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/XmlWriter.java (modified) * Major redesign of how JOSM talks to the OSM server. Connections now ... Wed, 18 Mar 2009 15:13:41 GMT stoecker [1499] * 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/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.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/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.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/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) * trunk/src/org/openstreetmap/josm/tools/DateUtils.java (added) close #2302 - patch by jttt - optimizations and encapsulation Fri, 06 Mar 2009 22:47:45 GMT stoecker [1463] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) delete start/end node of closed way correctly Mon, 16 Feb 2009 14:14:34 GMT stoecker [1415] * trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/JosmAction.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/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/visitor/BoundingXYVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainApplication.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/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/PleaseWaitDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.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/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified) * trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.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/BugReportExceptionHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) * trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (modified) * trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) applied patch #2185 by bruce89 Sat, 14 Feb 2009 11:25:54 GMT stoecker [1397] * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.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/OpenLocationAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.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/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) apply patches from xeen for #1977. Thu, 29 Jan 2009 17:13:55 GMT stoecker [1347] * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) fixed typo Fri, 26 Dec 2008 23:09:20 GMT stoecker [1182] * trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java (modified) * trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) fixed bug #1889 Tue, 23 Dec 2008 14:07:05 GMT stoecker [1169] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.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/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/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExitAction.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/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.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/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/NewAction.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/PreferencesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RedoAction.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/SelectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UndoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.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/MapMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.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/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/SequenceCommand.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/corrector/ReverseWayTagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrection.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTable.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.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/SelectionChangedListener.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/conflict/ConflictItem.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/EastNorth.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/GpxLink.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.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/DataSource.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DateFormatter.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/OsmUtils.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.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/CreateOsmChangeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.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/Mercator.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Projection.java (modified) * trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/IconToggleButton.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/MainMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapMover.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/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/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/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/SideButton.java (modified) * trunk/src/org/openstreetmap/josm/gui/SplashScreen.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/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.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/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/TileSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/WorldChooser.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/DataChangeListener.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/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.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/MarkerProducers.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/AreaElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.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/AudioPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.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/PreferenceSetting.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ForwardActionListener.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingCellRenderer.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/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/MyHttpHandler.java (modified) * trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmIdReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * 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/OsmTransferException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/XmlWriter.java (modified) * trunk/src/org/openstreetmap/josm/plugins/Plugin.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.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/PluginProxy.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) * trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java (modified) * trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (modified) * trunk/src/org/openstreetmap/josm/tools/DateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/Destroyable.java (modified) * trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (modified) * trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/GBC.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/OpenBrowser.java (modified) * trunk/src/org/openstreetmap/josm/tools/Pair.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/PrimaryDateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/Shortcut.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/XmlObjectParser.java (modified) removed usage of tab stops Tue, 02 Dec 2008 23:26:37 GMT framm [1101] * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) fix tag corrector to allow the swapping of keys between two tags. ... Tue, 21 Oct 2008 18:25:06 GMT cbrill [1047] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/NewAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RedoAction.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/SaveAsAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UndoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapMover.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.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) [Cleanup] Remove unused imports and unused variables, part 2 This ... Mon, 22 Sep 2008 01:53:47 GMT framm [1004] * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (modified) - display a confirmation request if user tries to delete data outside ... Thu, 18 Sep 2008 13:19:00 GMT stoecker [988] * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (modified) make advanced object deletion available for outside, so validator can ... Sun, 14 Sep 2008 10:27:24 GMT stoecker [965] * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) mninor fix Sat, 23 Aug 2008 22:18:15 GMT stoecker [853] * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified) create virtual nodes only in case point is moved Thu, 07 Aug 2008 08:03:52 GMT stoecker [755] * trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/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/NameVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) better sorting of selected elements and relation list, reenabled ... Wed, 06 Aug 2008 06:49:51 GMT stoecker [748] * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) some cleanups Sat, 05 Jul 2008 12:12:34 GMT stoecker [679] * trunk/presets/presets.xml (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified) * trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) finished XML based translations of presets fixes #960 correct ... Sun, 15 Jun 2008 10:28:42 GMT ramack [655] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExitAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RedoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.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/SplitWayAction.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/command/AddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/SequenceCommand.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/SelectionChangedListener.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/EastNorth.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/Changeset.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/User.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Projection.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainApplication.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/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.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/markerlayer/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (modified) * trunk/src/org/openstreetmap/josm/io/MyHttpHandler.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/tools/AudioPlayer.java (modified) * trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) patch by bruce89, closes #812; thanks bruce Sat, 10 May 2008 23:59:46 GMT framm [630] * 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/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (added) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified) - make commands able to fail (patch by DH) - add Command.getOrig() ... Sat, 10 May 2008 22:51:33 GMT framm [628] * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) - make ChangePropertyCommand() constructor take single object (patch ... Sat, 10 May 2008 19:47:30 GMT framm [627] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.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/AlignInRectangleAction.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/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExitAction.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/GroupAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.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/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/NewAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenAction.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/PreferencesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RedoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ReverseSegmentAction.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/SelectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UndoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.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/MapMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.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/PushbackTokenizer.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/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/SequenceCommand.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/SelectionChangedListener.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/conflict/ConflictItem.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/FromConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ToConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/EastNorth.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/GpxLink.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.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/DataSource.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DateFormatter.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/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Segment.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.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/DeleteVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.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/Mercator.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Projection.java (modified) * trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/IconToggleButton.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/MainMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapMover.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/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/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/SelectionManager.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/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.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/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.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/WorldChooser.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/DataChangeListener.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/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.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/MarkerProducers.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/AreaElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.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/AudioPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.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/PreferenceSetting.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/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ForwardActionListener.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/MyHttpHandler.java (modified) * trunk/src/org/openstreetmap/josm/io/MyHttpURLConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmIdReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.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/src/org/openstreetmap/josm/io/XmlWriter.java (modified) * trunk/src/org/openstreetmap/josm/plugins/Plugin.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.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/PluginProxy.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) * trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java (modified) * trunk/src/org/openstreetmap/josm/tools/Base64.java (modified) * trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (modified) * trunk/src/org/openstreetmap/josm/tools/DateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/Destroyable.java (modified) * trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (modified) * trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/GBC.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/OpenBrowser.java (modified) * trunk/src/org/openstreetmap/josm/tools/Pair.java (modified) * trunk/src/org/openstreetmap/josm/tools/PrimaryDateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.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/XmlObjectParser.java (modified) - added svn:eol-style prop to all .java files. it is suggested that ... Sat, 10 May 2008 19:40:01 GMT framm [626] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.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/AlignInRectangleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExitAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/GroupAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/NewAction.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/PreferencesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RedoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.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/UndoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.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/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/SequenceCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictItem.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (modified) * trunk/src/org/openstreetmap/josm/gui/BookmarkList.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/LayerListDialog.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/layer/markerlayer/AudioMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.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/AreaElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.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/LafPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmIdReader.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/src/org/openstreetmap/josm/plugins/Plugin.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginException.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) * trunk/src/org/openstreetmap/josm/tools/Base64.java (modified) * trunk/src/org/openstreetmap/josm/tools/Destroyable.java (modified) * trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (modified) * trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) * trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (modified) * trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java (modified) * trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/NodeTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/SegmentTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/WayTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/AddVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/tagging/TaggingPresetTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/plugins/PluginExceptionTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/plugins/PluginInformationTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/testframework/Bug.java (modified) * trunk/test/unit/org/openstreetmap/josm/testframework/DataSetTestCaseHelper.java (modified) * trunk/test/unit/org/openstreetmap/josm/testframework/MotherObject.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/DateParserTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/tools/XmlObjectParserTest.java (modified) - ye grande eol style fixe Sat, 15 Mar 2008 13:39:28 GMT framm [582] * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.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/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) * trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapFrame.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/NavigatableComponent.java (modified) * trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.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/download/BookmarkSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.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/markerlayer/AudioMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.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/MarkerProducers.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/PluginPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) - got rid of a few compiler warnings Sun, 07 Oct 2007 11:20:27 GMT gebner [343] * trunk/.classpath (modified) * trunk/images/cursor/rotate.png (modified) * trunk/images/data/relation.png (added) * trunk/images/dialogs/addrelation.png (added) * trunk/images/dialogs/addselected.png (added) * trunk/images/dialogs/relationlist.png (added) * trunk/images/dialogs/select.png (added) * trunk/images/mapmode/node/nodeway.png (added) * trunk/images/wayflip.png (added) * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ReorderAction.java (deleted) * trunk/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (added) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.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/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.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/FromConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ToConflict.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/NodePair.java (added) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (added) * trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (added) * trunk/src/org/openstreetmap/josm/data/osm/Segment.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java (added) * trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.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/DeleteVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.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/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/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/RelationEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (added) * 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/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/IncompleteDownloader.java (deleted) * trunk/src/org/openstreetmap/josm/io/OsmIdReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.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/RawGpsReader.java (modified) * trunk/src/org/openstreetmap/josm/io/XmlWriter.java (modified) * trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) Merge 0.5. Fri, 14 Sep 2007 12:44:28 GMT (none) [321] * trunk (added) * trunk/.classpath (moved) * trunk/.project (moved) * trunk/.settings (moved) * trunk/CONTRIBUTION (moved) * trunk/LICENSE (moved) * trunk/README (moved) * trunk/build.xml (moved) * trunk/data (moved) * trunk/images (moved) * trunk/josm.reg (moved) * trunk/lib (moved) * trunk/src (moved) * trunk/start.html (moved) * trunk/test (moved) - restructure of repository to support branches. Do 'svn switch ... Thu, 23 Aug 2007 13:59:32 GMT imi [312] * src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (modified) * src/org/openstreetmap/josm/command/MoveCommand.java (modified) * src/org/openstreetmap/josm/command/RotateCommand.java (modified) * src/org/openstreetmap/josm/gui/GettingStarted.java (modified) * src/org/openstreetmap/josm/gui/MapFrame.java (modified) * src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) - fixed bug to allow move of one node - removed "new shiny beta" ...