# # ChangeLog for trunk in josm # # Generated by Trac 1.6 # 2024-11-28T14:15:36+01:00 Sun, 07 Jun 2009 14:18:31 GMT stoecker [1653] * trunk/src/org/apache (added) * trunk/src/org/apache/tools (added) * trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java (added) * trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java (added) * trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified) add support for compressed OSM files (bzip2, gzip) Sun, 07 Jun 2009 13:28:38 GMT stoecker [1652] * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) make extended conflict resolving default Sun, 07 Jun 2009 13:17:01 GMT Gubaer [1651] * trunk/build.xml (modified) removed local target (should not have been committed in r1650) Sun, 07 Jun 2009 13:04:28 GMT Gubaer [1650] * trunk/.classpath (modified) * trunk/.settings/org.eclipse.jdt.core.prefs (modified) * trunk/.settings/org.eclipse.jdt.ui.prefs (modified) * trunk/build.xml (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairListCellRenderer.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/ListRole.java (added) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified) added concept of "merge pairs" (my vs. merged, my vs. their, their ... Sun, 07 Jun 2009 09:22:20 GMT stoecker [1649] * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fix #1946 - plugin update Sun, 07 Jun 2009 08:10:06 GMT stoecker [1648] * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) prevent overwriting of GPX files Sun, 07 Jun 2009 00:56:33 GMT stoecker [1647] * trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.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/plugins/PluginDownloader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fixed plugin handling a bit Sat, 06 Jun 2009 19:39:12 GMT stoecker [1646] * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.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/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) cleanup in file access Sat, 06 Jun 2009 19:38:10 GMT stoecker [1645] * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) fix #1903 - don't download plugins for newer JOSM versions Sat, 06 Jun 2009 19:29:33 GMT stoecker [1644] * trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (modified) fix #2685 - changed Mercator code Sat, 06 Jun 2009 15:14:03 GMT stoecker [1643] * trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) fix #2331 - patch by dmuecke - zoom under MacOs 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:37:14 GMT stoecker [1641] * 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) fix #2673 - patch by jttt - key=value operator for search action 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 12:28:11 GMT stoecker [1639] * trunk/images/mirror.png (added) * trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (added) * trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) fix #2024 - patch by Daeron - added Mirror action Sat, 06 Jun 2009 11:47:56 GMT stoecker [1638] * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) fixed 2421 - patch by jttt - negative HDOP Sat, 06 Jun 2009 11:43:30 GMT stoecker [1637] * trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/io/FileImporter.java (added) * trunk/src/org/openstreetmap/josm/io/GpxImporter.java (added) * trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (added) * trunk/src/org/openstreetmap/josm/io/OsmImporter.java (added) applied new file io from #2064 - patch by dmuecke 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 Sat, 06 Jun 2009 11:33:27 GMT stoecker [1635] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified) * trunk/styles/standard/elemstyles.xml (modified) fix #2667 - patch by Daeron - Add support for dash patterns in mappaint Sat, 06 Jun 2009 11:26:19 GMT stoecker [1634] * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) fix #2483 - patch by dmuecke - rotate does not work under Mac OS X Sat, 06 Jun 2009 11:21:56 GMT stoecker [1633] * trunk/src/org/openstreetmap/josm/Main.java (modified) fix #2688 - patch by jttt - solve NPE Tue, 02 Jun 2009 11:44:16 GMT stoecker [1632] * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) fixed #2683 - preset loading error 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 ... Sun, 31 May 2009 22:07:28 GMT stoecker [1630] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/styles/standard/elemstyles.xml (modified) close #2677 - NPE on upload Sat, 30 May 2009 15:24:29 GMT stoecker [1629] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/styles/standard/elemstyles.xml (modified) close #2426 - now mappaint handles area types which require closed ... Sat, 30 May 2009 11:58:30 GMT stoecker [1628] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/historycombobox/JHistoryComboBox.java (modified) * trunk/src/org/openstreetmap/josm/gui/historycombobox/StringUtils.java (deleted) * trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestingJHistoryComboBox.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) cleanup group settings in preferences Fri, 29 May 2009 17:23:57 GMT ce [1627] * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) removed two @Override to make it compile with java 1.5 Fri, 29 May 2009 08:47:02 GMT stoecker [1626] * trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.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/tags/TagMergeTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified) fixed Java 1.5 problems Thu, 28 May 2009 15:55:57 GMT stoecker [1625] * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) fix #2663 - patch by jttt - better errors for illegal searches Thu, 28 May 2009 15:49:08 GMT stoecker [1624] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) fix #2654 - patch by Daeron - Infinite loop in relation editor Thu, 28 May 2009 15:45:04 GMT stoecker [1623] * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) closed #2596 - wrong texts in plugin information 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. Mon, 25 May 2009 15:08:44 GMT stoecker [1621] * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) fix #2655 - NPE with empty role Sun, 24 May 2009 21:19:53 GMT Gubaer [1620] * trunk/images/dialogs/conflict (added) * trunk/images/dialogs/conflict/copyaftercurrentleft.png (added) * trunk/images/dialogs/conflict/copyaftercurrentleft.svg (added) * trunk/images/dialogs/conflict/copyaftercurrentright.png (added) * trunk/images/dialogs/conflict/copyaftercurrentright.svg (added) * trunk/images/dialogs/conflict/copybeforecurrentleft.png (added) * trunk/images/dialogs/conflict/copybeforecurrentleft.svg (added) * trunk/images/dialogs/conflict/copybeforecurrentright.png (added) * trunk/images/dialogs/conflict/copybeforecurrentright.svg (added) * trunk/images/dialogs/conflict/copyendleft.png (added) * trunk/images/dialogs/conflict/copyendleft.svg (added) * trunk/images/dialogs/conflict/copyendright.png (added) * trunk/images/dialogs/conflict/copyendright.svg (added) * trunk/images/dialogs/conflict/copystartleft.png (added) * trunk/images/dialogs/conflict/copystartleft.svg (added) * trunk/images/dialogs/conflict/copystartright.png (added) * trunk/images/dialogs/conflict/copystartright.svg (added) * trunk/images/dialogs/conflict/mergecomplete.png (added) * trunk/images/dialogs/conflict/mergecomplete.svg (added) * trunk/images/dialogs/conflict/mergeincomplete.png (added) * trunk/images/dialogs/conflict/mergeincomplete.svg (added) * trunk/images/dialogs/conflict/movedown.png (added) * trunk/images/dialogs/conflict/movedown.svg (added) * trunk/images/dialogs/conflict/moveup.png (added) * trunk/images/dialogs/conflict/moveup.svg (added) * trunk/images/dialogs/conflict/remove.png (added) * trunk/images/dialogs/conflict/remove.svg (added) * trunk/images/dialogs/conflict/tagkeepmine.png (added) * trunk/images/dialogs/conflict/tagkeepmine.svg (added) * trunk/images/dialogs/conflict/tagkeeptheir.png (added) * trunk/images/dialogs/conflict/tagkeeptheir.svg (added) * trunk/images/dialogs/conflict/tagundecide.png (added) * trunk/images/dialogs/conflict/tagundecide.svg (added) icons to be used in the upcoming improved dialog for conflict resolution Sun, 24 May 2009 16:35:56 GMT stoecker [1619] * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) hopefully fixed UTF-8 problems in plugin info - #2596 Sun, 24 May 2009 10:53:58 GMT stoecker [1618] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) close #2643 - patch by Teemu Koskinen - Better linkedness support for ... 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 ... Sun, 24 May 2009 10:18:25 GMT stoecker [1616] * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) fix #2646 - illegal variable acces in relation editor Sat, 23 May 2009 20:38:01 GMT stoecker [1615] * trunk/lib/josm-translation.jar (modified) updated i18n Sat, 23 May 2009 19:54:50 GMT stoecker [1614] * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/corrector/RoleCorrection.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) fix #2642 - patch by Teemu Koskinen - TagCorrector didn't work ... Sat, 23 May 2009 18:24:40 GMT stoecker [1613] * trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (modified) * trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) fixed #2172 - Teemu Koskinen - ReverseWayTagCorrector's role ... Sat, 23 May 2009 11:38:47 GMT stoecker [1612] * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) fix classcast exception Sat, 23 May 2009 10:03:21 GMT stoecker [1611] * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) fix #2578 - exception on zero length ways Sat, 23 May 2009 09:53:37 GMT stoecker [1610] * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (modified) * trunk/src/org/openstreetmap/josm/io/CacheFiles.java (added) add generic caching class (e.g. for WMS plugin) - patch by xeen Sat, 23 May 2009 09:49:09 GMT stoecker [1609] * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) fix #2630 - patch by Teemu Koskinen - Split backward-role ways correctly Sat, 23 May 2009 09:36:04 GMT stoecker [1608] * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) close #2633 - patch by Gubaer - better error message for server aborts Wed, 20 May 2009 14:08:00 GMT stoecker [1607] * trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) fix #2612 - changed patch by avar - Cleanup regex search Wed, 20 May 2009 13:59:44 GMT stoecker [1606] * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) close #2226 - patch by xeen - make presets in right menu clickable Tue, 19 May 2009 17:11:56 GMT stoecker [1605] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) fixed #2425. set default projection to Mercator. It looks much better ... Tue, 19 May 2009 17:05:10 GMT stoecker [1604] * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) fixed #2545 - patch by Gubaer - JOSM has problems with files from XAPI Tue, 19 May 2009 17:01:13 GMT stoecker [1603] * 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/plugins/PluginSelection.java (modified) fixed #2602 - patch by Matt,avar - Search keywords child and parent Tue, 19 May 2009 16:53:16 GMT stoecker [1602] * trunk/src/org/openstreetmap/josm/gui/download/OsmMapControl.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified) better keyboard support for slippy map chooser - patch by jpstotz Tue, 19 May 2009 16:45:54 GMT stoecker [1601] * 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/io/GpxWriter.java (modified) fix #2547 - patch by Henrik Niehaus - Audio/picture markers no longer ... Tue, 19 May 2009 16:43:02 GMT stoecker [1600] * trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) fixed #2607 - patch by Teemu Koskinen - Don't add splitted ways in ... Mon, 18 May 2009 22:16:01 GMT framm [1599] * 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 (added) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (moved) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (added) create framework for type-specific relation editors Mon, 18 May 2009 17:47:22 GMT framm [1598] * trunk/src/org/openstreetmap/josm/actions/AboutAction.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/RelationEditor.java (modified) * secured all methods in Way class against breakage when used with ... Mon, 18 May 2009 14:37:04 GMT stoecker [1597] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) fixed #2547, updated translations Sun, 17 May 2009 22:07:01 GMT framm [1596] * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (modified) * added primitive code to relation editor that shows whether or not ... Sun, 17 May 2009 22:06:07 GMT framm [1595] * trunk/.classpath (modified) fix eclipse project classpath to use new gettext lib Fri, 15 May 2009 20:22:21 GMT stoecker [1594] * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) fixed missing import. closes #2585 Fri, 15 May 2009 16:13:02 GMT stoecker [1593] * trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified) fix compiling error #2585 Fri, 15 May 2009 08:05:37 GMT stoecker [1592] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified) fixed #2583 - patch by Michel Marti - fon't move objects when copying ... Fri, 15 May 2009 07:38:39 GMT stoecker [1591] * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) improved plugin information download Thu, 14 May 2009 16:02:02 GMT stoecker [1590] * trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) fixed #2572 - patch by Gubaer - fixed illegal access on nonexisting files Thu, 14 May 2009 15:57:49 GMT stoecker [1589] * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) fixed #2575 - illegal defaults for gps line drawing Tue, 12 May 2009 16:05:11 GMT stoecker [1588] * trunk/src/org/openstreetmap/josm/plugins/PluginDescription.java (deleted) * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) fixed plugin handling. closes #2530 and #762 Tue, 12 May 2009 14:49:45 GMT stoecker [1587] * trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified) fixed #2420 - patch by Gubaer - Saved OSM file can contain empty API ... Mon, 11 May 2009 15:33:36 GMT stoecker [1586] * trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (modified) fix hardcoded URL - patch by Gubaer Mon, 11 May 2009 15:29:50 GMT stoecker [1585] * trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestingJHistoryComboBox.java (modified) fixed #2542 - patch by Gubaer - fix recursion in uplaod comment history Fri, 08 May 2009 07:05:44 GMT stoecker [1584] * trunk/build.xml (modified) * trunk/lib/gettext-commons-0.9.2.jar (deleted) * trunk/lib/gettext-commons-0.9.6.jar (added) updated gettext Thu, 07 May 2009 18:00:43 GMT stoecker [1583] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) close #2535 - patch by podolsir - NPE for missing icon, update ... Thu, 07 May 2009 16:04:54 GMT stoecker [1582] * trunk/src/org/openstreetmap/josm/data/projection/Projection.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java (added) fix #2540 - patch by Gubaer - added Swiss grid Thu, 07 May 2009 15:55:45 GMT stoecker [1581] * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) fix #2429 - patch by Gubaer - fix upload cancel Wed, 06 May 2009 17:49:44 GMT ce [1580] * trunk/presets/presets.xml (modified) added concrete as surface to tracks and removed some surface values ... Wed, 06 May 2009 16:24:15 GMT stoecker [1579] * trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) fixed in-XML translation of presets Tue, 05 May 2009 16:57:13 GMT framm [1578] * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) send changeset in payload when not using diff upload. fixes #2511. Tue, 05 May 2009 15:39:15 GMT stoecker [1577] * trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified) close #1872 - patch by avar - handle GPX line drawing different for ... Tue, 05 May 2009 14:51:53 GMT stoecker [1576] * trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified) close #2423 - patch by Igor Shubovych - Filter for advanced preferences Tue, 05 May 2009 14:49:28 GMT stoecker [1575] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/historycombobox (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/ComboBoxHistory.java (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/EventConsumingPlainDocument.java (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/HistoryChangedListener.java (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/JHistoryComboBox.java (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/StringUtils.java (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestingJHistoryComboBox.java (added) * trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestionListener.java (added) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) close #2443 - patch by Henrik Niehaus - History for commit dialog Tue, 05 May 2009 14:44:44 GMT stoecker [1574] * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified) close #2214 - patch by Henrik Niehaus - GPX export metadata handling Tue, 05 May 2009 14:36:08 GMT stoecker [1573] * trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) close #2424 - patch by Henrik Niehaus - exception fixed Tue, 05 May 2009 14:32:19 GMT stoecker [1572] * trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (modified) close #2464 - patch by Henrik Niehaus - audio preferences fixed Tue, 05 May 2009 14:10:24 GMT stoecker [1571] * trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) close #2505 - handling separator in toolbar prefs Tue, 05 May 2009 13:46:25 GMT stoecker [1570] * trunk/CONTRIBUTION (modified) * trunk/LICENSE (modified) * trunk/README (modified) fix encoding for text files - closes #2494 Mon, 04 May 2009 19:29:58 GMT ce [1569] * trunk/images/presets/relations.png (added) * trunk/presets/presets.xml (modified) first (ugly) relation icon to make the button in the toolbar show ... Mon, 04 May 2009 18:44:27 GMT ce [1568] * trunk/presets/presets.xml (modified) added motorroad to trunk and primary, due to #2489. Sat, 02 May 2009 18:09:40 GMT framm [1567] * 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/osm/visitor/MergeVisitor.java (modified) * fixed some more conflict resolution bugs, especially relating to ... Thu, 30 Apr 2009 13:59:56 GMT stoecker [1566] * trunk/lib/josm-translation.jar (modified) updated languages Tue, 28 Apr 2009 21:12:48 GMT ulfl [1565] * trunk/presets/presets.xml (modified) various minor item sequence changes and added separators Tue, 28 Apr 2009 20:40:14 GMT ulfl [1564] * trunk/presets/presets.xml (modified) trying to sort barrier items based on map features: - node barriers ... Tue, 28 Apr 2009 18:47:13 GMT framm [1563] * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * fixed content-type headers for API requests. always use text/xml if ... Tue, 28 Apr 2009 17:37:14 GMT stoecker [1562] * trunk/LICENSE (modified) * trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified) fix #2419 - MOTD language not changing - patch by xeen Mon, 27 Apr 2009 22:49:48 GMT framm [1561] * 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) * properly update version numbers on conflict resolution. fixes #2468. Mon, 27 Apr 2009 21:49:19 GMT framm [1560] * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) * "learn" new version numbers on repeated download Mon, 27 Apr 2009 21:21:28 GMT framm [1559] * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * improved error message handling for messages that come from the server. Sun, 26 Apr 2009 23:04:01 GMT framm [1558] * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * only add new data sources to layer upon merge if new sources are ... Sun, 26 Apr 2009 23:02:50 GMT framm [1557] * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) rename "getSelectedPhysical" to "getSelectedNodesAndWays" Sun, 26 Apr 2009 03:45:37 GMT ulfl [1556] * trunk/styles/standard/elemstyles.xml (modified) comment out pedestrian / pier area (for now) Fri, 24 Apr 2009 23:41:22 GMT framm [1555] * trunk/styles/standard/elemstyles.xml (modified) * hooray for highway=street_lamp! Fri, 24 Apr 2009 14:08:34 GMT framm [1554] * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * fix relation ordering support (up/down buttons in relation editor)