# # ChangeLog for trunk in josm # # Generated by Trac 1.6 # 2024-12-01T03:56:31+01:00 Wed, 15 Jul 2009 22:41:38 GMT framm [1797] * trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.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/tools/OsmUrlToBounds.java (modified) - minor changes in conjunction with the Walking Papers plugin. Wed, 15 Jul 2009 18:51:12 GMT framm [1796] * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) - comment out "getSkippedWays" references in MultiFetch test, did not ... Wed, 15 Jul 2009 16:44:58 GMT Gubaer [1795] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) fixed #2901: Relation editor producing errors Wed, 15 Jul 2009 16:28:23 GMT Gubaer [1794] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) implemented #2664: Set the role for multiple members at the same time Wed, 15 Jul 2009 15:58:37 GMT Gubaer [1793] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) fixed #2638: Relation editor should show double entries better Wed, 15 Jul 2009 15:47:09 GMT Gubaer [1792] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IMemberModelListener.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) fixed #2647: Relation editor: moving members should keep them in view Wed, 15 Jul 2009 15:39:54 GMT framm [1791] * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) - remove unused variable from PluginDownloader - fix MultiFetch test ... Wed, 15 Jul 2009 15:22:56 GMT Gubaer [1790] * trunk/src/org/openstreetmap/josm/actions/NewAction.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/SideButton.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/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java (added) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.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/OsmServerHistoryReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) Relation Editor: complete rework Relation Editor: had to temporarily ... Wed, 15 Jul 2009 13:31:06 GMT stoecker [1789] * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) fixed charset issue Tue, 14 Jul 2009 16:20:56 GMT stoecker [1788] * trunk/lib/josm-translation.jar (modified) updated i18n Tue, 14 Jul 2009 14:26:06 GMT stoecker [1787] * 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/RelationListDialog.java (modified) unify design Tue, 14 Jul 2009 14:04:01 GMT stoecker [1786] * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) close #2802 - patch by dmuecke - Exception fixed Tue, 14 Jul 2009 08:26:31 GMT stoecker [1785] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (added) applied #2941 - patch by cjw - improve relation sorting Mon, 13 Jul 2009 16:54:19 GMT Gubaer [1784] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified) removing debug output Mon, 13 Jul 2009 16:47:57 GMT Gubaer [1783] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) fixed #2929: Relation Editor: Cancel button does not cancel edits Mon, 13 Jul 2009 13:43:40 GMT stoecker [1782] * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) fixed #2928 - patch by Michi - unify GUI Mon, 13 Jul 2009 13:40:50 GMT stoecker [1781] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java (modified) fix #2927 - patch my Michi - fix mouse position Mon, 13 Jul 2009 12:41:19 GMT stoecker [1780] * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) fix #2935 - selected relation wrong Sun, 12 Jul 2009 17:50:32 GMT Gubaer [1779] * trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified) fixed #2923: Info/History dialog (C-i / C-h) links to ... Sun, 12 Jul 2009 17:38:18 GMT Gubaer [1778] * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) fixed #2925: Double-clicking on relation in relation dialog doesn't ... Sun, 12 Jul 2009 12:38:43 GMT stoecker [1777] * trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified) fixed style selection box Sun, 12 Jul 2009 12:01:04 GMT stoecker [1776] * trunk/lib/josm-translation.jar (modified) i18n update Sun, 12 Jul 2009 11:40:41 GMT Gubaer [1775] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) removed debugging code Sun, 12 Jul 2009 11:18:56 GMT stoecker [1774] * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) i18n fix Sun, 12 Jul 2009 11:16:35 GMT Gubaer [1773] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) removed debugging code Sun, 12 Jul 2009 11:11:06 GMT Gubaer [1772] * 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/GenericRelationEditor.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/layer/Layer.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.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/OsmServerLocationReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified) fixed #2911: Relation editor doesn't notice all members downloaded ... Sun, 12 Jul 2009 08:40:30 GMT Gubaer [1771] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagFieldEditor.java (modified) fixed #2914: Re-edits in relation-editor impossible Sun, 12 Jul 2009 07:37:16 GMT Gubaer [1770] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (modified) fixed #2915: relation-editor: relation-only edit does not trigger ... Sat, 11 Jul 2009 16:09:30 GMT stoecker [1769] * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fix #2902 - patch by jttt - plugin update Sat, 11 Jul 2009 13:37:10 GMT stoecker [1768] * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) close #2781 - patch by Landwirt - fix align in circle Sat, 11 Jul 2009 12:52:02 GMT stoecker [1767] * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fix #2859 - better plugin support for older versions 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 Sat, 11 Jul 2009 11:07:47 GMT Gubaer [1765] * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) fixed problem with hidden property edit dialog Sat, 11 Jul 2009 10:33:24 GMT Gubaer [1764] * trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) fixed #1361: Relation dialog: "Download inclomplete..." blocks JOSM ... Sat, 11 Jul 2009 08:06:41 GMT Gubaer [1763] * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) fixed #2238: Calling Relation editor using properties dialog should ... Sat, 11 Jul 2009 07:32:42 GMT Gubaer [1762] * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.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/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagFieldEditor.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagModel.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionCache.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionItemPritority.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionList.java (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionListItem.java (added) added: improved tag editor grid in relation editor (borrowed code ... Sat, 11 Jul 2009 04:50:58 GMT Gubaer [1761] * trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified) fixed #2886: Make slippymap downloader hint text translatable Sat, 11 Jul 2009 04:38:06 GMT Gubaer [1760] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified) fixed #2882: Handling error message Fri, 10 Jul 2009 18:32:09 GMT stoecker [1759] * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) don't show preset dialog if there is nothing to show Thu, 09 Jul 2009 17:28:07 GMT stoecker [1758] * trunk/presets/presets.xml (modified) * trunk/styles/standard/elemstyles.xml (modified) added help texts Thu, 09 Jul 2009 16:59:25 GMT stoecker [1757] * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified) fixed translation error Thu, 09 Jul 2009 16:54:09 GMT Gubaer [1756] * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) fixed #2888: Check for deleted elements should ignore incomplete elements Thu, 09 Jul 2009 08:53:33 GMT stoecker [1755] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.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/download/SlippyMapChooser.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (added) * trunk/src/org/openstreetmap/josm/tools/WikiReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) fixed build error due to slippy map change, i18n update, added pt_BR Thu, 09 Jul 2009 07:08:17 GMT stoecker [1754] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) cleanup relation sorting Wed, 08 Jul 2009 20:58:37 GMT Gubaer [1753] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) fixed #2245: Merge layers doesn't update the "action" tags Wed, 08 Jul 2009 20:10:42 GMT Gubaer [1752] * trunk/test/config/test-unit-env.properties (added) * trunk/test/unit/build.xml (deleted) clean up in unit test environment Wed, 08 Jul 2009 20:06:58 GMT Gubaer [1751] * trunk/build.xml (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/test-unit-env.properties (deleted) patch by dmuecke - improved unit tests and test targets in build.xml Wed, 08 Jul 2009 19:50:32 GMT Gubaer [1750] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added) * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict (added) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (added) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (added) * trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (added) * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/test/config (added) * trunk/test/config/unit-josm.home (added) * trunk/test/config/unit-josm.home/preferences (added) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) new: replaced global conflict list by conflict list per layer, ... Wed, 08 Jul 2009 18:41:54 GMT stoecker [1749] * trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified) improved error messages Wed, 08 Jul 2009 18:23:47 GMT stoecker [1748] * trunk/images/dialogs/sort.png (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) applied relation sort - fix #27789 - patch by cjw Wed, 08 Jul 2009 13:26:12 GMT stoecker [1747] * trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Node.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/Rule.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified) * trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) close #2874 (NPE), improved external style handling Tue, 07 Jul 2009 18:51:26 GMT stoecker [1746] * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) fixed #2757 - josm reports wrong version Tue, 07 Jul 2009 18:20:59 GMT stoecker [1745] * trunk/styles/standard/elemstyles_gb.xml (modified) updated british style meta information Tue, 07 Jul 2009 18:07:52 GMT stoecker [1744] * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) fixed #2823 Tue, 07 Jul 2009 17:54:54 GMT stoecker [1743] * trunk/src/org/openstreetmap/josm/data/projection/UTM.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/MapPaintStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/Rule.java (added) * trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.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/StyleSources.java (added) * 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/MirroredInputStream.java (modified) added much improved preferences for external styles and presets Tue, 07 Jul 2009 07:04:00 GMT stoecker [1742] * trunk/src/org/openstreetmap/josm/actions/PreferencesAction.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/PreferenceSettingFactory.java (added) * 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/plugins/PluginHandler.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java (added) fixed #2849 - patch by jttt - fix memory leak Mon, 06 Jul 2009 15:53:10 GMT stoecker [1741] * trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) fixed #2847 - patch by Landwirt - better circle creation using two ... Mon, 06 Jul 2009 14:35:08 GMT stoecker [1740] * trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) fixed #2846 - wrong rounding Mon, 06 Jul 2009 13:32:02 GMT stoecker [1739] * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fixed NPE - #2836 Sun, 05 Jul 2009 17:42:18 GMT stoecker [1738] * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) plugin patch from jttt - close #2813 Sun, 05 Jul 2009 17:26:10 GMT stoecker [1737] * trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) fixed NPE Sun, 05 Jul 2009 14:16:30 GMT stoecker [1736] * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) fixed #2823 - NPE Sun, 05 Jul 2009 09:01:33 GMT framm [1735] * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) - do NOT drop created_by on changesets... duh! Sun, 05 Jul 2009 08:50:56 GMT stoecker [1734] * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) close #2780 - patch by sbrunner - make hdop factor ... Sun, 05 Jul 2009 08:48:09 GMT stoecker [1733] * trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fixed #2821, #2775 - agpifojpicture position wrong, preferences ... Sat, 04 Jul 2009 20:32:30 GMT stoecker [1732] * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) close #2813 - updating plugins disabled plugins Sat, 04 Jul 2009 20:10:43 GMT stoecker [1731] * trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) fixed #2815 - NPE Sat, 04 Jul 2009 18:33:36 GMT stoecker [1730] * trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) fixed #2811 - NPE in GeoImageLayer Sat, 04 Jul 2009 12:53:24 GMT stoecker [1729] * trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified) fix #2731 - Einstein values no longer ignored 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 22:03:39 GMT stoecker [1727] * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) fixed last fix Fri, 03 Jul 2009 21:50:09 GMT stoecker [1726] * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified) missing button markers for layer switches (e.g. for audio tracks) fixed Fri, 03 Jul 2009 21:15:39 GMT stoecker [1725] * trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.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/gui/NavigatableComponent.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/layer/GeoImageLayer.java (modified) some cleanups Fri, 03 Jul 2009 20:19:22 GMT stoecker [1724] * trunk/src/org/openstreetmap/josm/data/Bounds.java (modified) * trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (added) * 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/Node.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.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/SwissGrid.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/UTM.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/ButtonMarker.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/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) * trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/DateUtils.java (modified) * trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) some more changes and bug fixes related to new projection stuff - GPX ... Fri, 03 Jul 2009 18:58:24 GMT ulfl [1723] * trunk/styles/standard/elemstyles.xml (modified) add rules for: public_transport=stop_position public_transport=platform 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 ... Thu, 02 Jul 2009 16:02:27 GMT david [1721] * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) trac 2784: properly take account of timezones in GPX files. ... Thu, 02 Jul 2009 00:04:40 GMT framm [1720] * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) + silently drop created_by tag on upload of any object (we have them ... Wed, 01 Jul 2009 21:06:56 GMT ulfl [1719] * trunk/styles/standard/elemstyles_gb.xml (modified) fix a syntax bug Wed, 01 Jul 2009 20:33:17 GMT ulfl [1718] * trunk/styles/standard/elemstyles_gb.xml (added) add a file with GB specific rules that can act as an "overlay" to the ... Wed, 01 Jul 2009 20:01:40 GMT ulfl [1717] * trunk/styles/standard/elemstyles.xml (modified) add (commented out) rules for ireland specific turn restriction and ... Wed, 01 Jul 2009 19:24:08 GMT ulfl [1716] * trunk/styles/standard/elemstyles.xml (modified) fix #2770: add realwidth values for trunk and some xy_link rules Wed, 01 Jul 2009 19:07:19 GMT ulfl [1715] * trunk/styles/standard/elemstyles.xml (modified) fix #1559: remove rules for foot=designated, horse=designated and ... Wed, 01 Jul 2009 18:46:11 GMT ulfl [1714] * trunk/styles/standard/elemstyles.xml (modified) fix #2516: display railway=abandoned or railway=disused in ... Sun, 28 Jun 2009 20:41:25 GMT stoecker [1713] * trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) fix #2781 - patch by pov - better calculations for align in circle Sun, 28 Jun 2009 13:28:36 GMT stoecker [1712] * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) added security check for unwanted moves Sun, 28 Jun 2009 12:40:12 GMT stoecker [1711] * trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) * trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) support URL's for preset images Sun, 28 Jun 2009 10:08:30 GMT Gubaer [1710] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) Deleted strange comment Sun, 28 Jun 2009 09:37:21 GMT Gubaer [1709] * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history (added) * trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (added) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (added) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified) new: history feature implemented Sat, 27 Jun 2009 13:59:15 GMT stoecker [1708] * trunk/lib/josm-translation.jar (modified) updated i18n, added chinese Sat, 27 Jun 2009 12:03:30 GMT Gubaer [1707] * trunk/test/functional/org/openstreetmap/josm/gui (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags (added) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs (added) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (added) * trunk/test/functional/org/openstreetmap/josm/gui/history (added) * trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (added) * trunk/test/lib (added) * trunk/test/lib/fest (added) * trunk/test/lib/fest/LICENSE-2.0.txt (added) * trunk/test/lib/fest/MRJToolkitStubs-1.0.jar (added) * trunk/test/lib/fest/README.txt (added) * trunk/test/lib/fest/debug-1.0.jar (added) * trunk/test/lib/fest/fest-assert-1.0.jar (added) * trunk/test/lib/fest/fest-reflect-1.1.jar (added) * trunk/test/lib/fest/fest-swing-1.1.jar (added) * trunk/test/lib/fest/fest-util-1.0.jar (added) * trunk/test/lib/fest/jcip-annotations-1.0.jar (added) * trunk/test/lib/junit (added) * trunk/test/lib/junit/README.txt (added) * trunk/test/lib/junit/cpl-v10.html (added) * trunk/test/lib/junit/junit-4.6.jar (added) * trunk/test/unit/build.xml (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) test cases and test libraries (JUnit 4.6 and FEST) Sat, 27 Jun 2009 10:37:10 GMT stoecker [1706] * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) fixed some design issues Sat, 27 Jun 2009 09:52:56 GMT stoecker [1705] * trunk/src/org/openstreetmap/josm/io/CacheFiles.java (modified) fix #2706 - patch by bilbo - allow to set WMS cache path again Sat, 27 Jun 2009 09:46:17 GMT stoecker [1704] * trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) fix #2674, #765 - patch by jttt - reworked GeoImage stuff Sat, 27 Jun 2009 09:05:23 GMT Gubaer [1703] * trunk/test/functional (added) * trunk/test/functional/org (added) * trunk/test/functional/org/openstreetmap (added) * trunk/test/functional/org/openstreetmap/josm (added) * trunk/test/functional/org/openstreetmap/josm/io (added) * trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (added) * trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (added) * trunk/test/functional/test-functional-env.properties (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties (added) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (added) added test cases Sat, 27 Jun 2009 00:30:28 GMT Gubaer [1702] * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) cosmetics Sat, 27 Jun 2009 00:14:00 GMT Gubaer [1701] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor (added) * trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (added) * trunk/test/unit/test-unit-env.properties (added) updated merge logic and unit tests for MergeVisitor Sat, 27 Jun 2009 00:12:55 GMT Gubaer [1700] * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) enable new InfoAction Fri, 26 Jun 2009 23:52:57 GMT Gubaer [1699] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) updated merge rules. deleted state of my version has precedence over ... Fri, 26 Jun 2009 23:23:34 GMT Gubaer [1698] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) fixed #2759: OsmApiException message is crippled by showMessageDialog