# # ChangeLog for trunk/src/org/openstreetmap/josm/gui/history in josm # # Generated by Trac 1.6 # 2024-03-29T09:22:14+01:00 Sun, 11 Oct 2009 20:03:25 GMT Gubaer [2275] * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified) fixed #3694: History dialog for relations does not work Wed, 07 Oct 2009 15:12:46 GMT stoecker [2254] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) i18n update Mon, 05 Oct 2009 19:39:15 GMT Gubaer [2250] * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (added) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (added) * trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (modified) fixed #3653: History for anonymous users should not be clickable ... Sun, 04 Oct 2009 10:58:19 GMT stoecker [2245] * trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) don't shorten text when there is enough space Sun, 04 Oct 2009 10:07:16 GMT Gubaer [2243] * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateTableCellRenderer.java (deleted) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateTableColumnModel.java (deleted) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateViewer.java (deleted) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (modified) fixed #3650: Double-click on items in history dialog should open ... Sat, 03 Oct 2009 22:37:05 GMT stoecker [2242] * trunk/src/org/openstreetmap/josm/data/osm/history/History.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/gui/history/CoordinateTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) fixed #3649 - show node coordinates in history dialog Sat, 03 Oct 2009 14:24:29 GMT Gubaer [2239] * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified) see #3626: Show history for any object in history dialog (partially ... Tue, 22 Sep 2009 15:39:09 GMT stoecker [2182] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) fixed 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 09:05:58 GMT stoecker [2165] * trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (added) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (added) * 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/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) applied #3532 - path by Dave Hansen - infrastructure for faster data ... Sat, 12 Sep 2009 04:38:11 GMT Gubaer [2096] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) applied #3455: patch by Claudius Henrichs: Incorrect closing html ... 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 ... Thu, 03 Sep 2009 19:54:04 GMT Gubaer [2044] * trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (modified) fixed #3383: changeset tags in history dialog Mon, 31 Aug 2009 06:06:25 GMT Gubaer [2019] * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java (added) * 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/HistoryBrowserDialogManager.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (modified) Improved history feature 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, 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 ... Sun, 23 Aug 2009 15:45:53 GMT Gubaer [1987] * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.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/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) removed all occurences of setAlwaysOnTop(). See ... Mon, 27 Jul 2009 16:50:48 GMT Gubaer [1861] * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.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/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) added diagnostic messages for #3109 - window order generally messed up? Wed, 08 Jul 2009 19:50:32 GMT Gubaer [1750] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict (added) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (added) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (added) * trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (added) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/test/config (added) * trunk/test/config/unit-josm.home (added) * trunk/test/config/unit-josm.home/preferences (added) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) new: replaced global conflict list by conflict list per layer, ... Sun, 28 Jun 2009 09:37:21 GMT Gubaer [1709] * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history (added) * trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (added) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified) new: history feature implemented