#
# ChangeLog for trunk/.settings in josm
#
# Generated by Trac 1.6
# 2024-11-19T00:14:18+01:00

Sat, 20 Jun 2009 07:31:00 GMT Gubaer [1682]
	* trunk/.settings/org.eclipse.jdt.ui.prefs (modified)
	* trunk/build.xml (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (deleted)
	* trunk/src/org/openstreetmap/josm/data/conflict (deleted)
	* trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (deleted)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	removed old conflict resolution code
	fixed bug in OsmApi (missing ...


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 ...


Wed, 17 Sep 2008 00:16:26 GMT framm [981]
	* trunk/.settings/org.eclipse.jdt.core.prefs (modified)

	- applied source code formatting patch from #1462


Sat, 19 Apr 2008 15:55:29 GMT framm [614]
	* trunk/.settings/org.eclipse.jdt.core.prefs (modified)
	* trunk/presets/presets.xml (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	- support for sub-menus in tagging presets (simply name them ...


Thu, 17 Apr 2008 01:03:28 GMT framm [608]
	* trunk/.settings/org.eclipse.jdt.ui.prefs (modified)
	* trunk/images/mapmode/extrude (added)
	* trunk/images/mapmode/extrude/extrude.png (added)
	* trunk/images/mapmode/extrude/move.png (added)
	* trunk/images/mapmode/extrude/p.png (added)
	* trunk/images/statusline (added)
	* trunk/images/statusline/angle.png (added)
	* trunk/images/statusline/dist.png (added)
	* trunk/images/statusline/heading.png (added)
	* trunk/images/statusline/lat.png (added)
	* trunk/images/statusline/lon.png (added)
	* trunk/images/statusline/name.png (added)
	* trunk/src/org/openstreetmap/josm/actions/AlignInRectangleAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/coor/Coordinate.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/data/osm/visitor/SimplePaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapScaler.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/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java (added)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified)

	- new extrude mode allows creation of rectangular shapes
	- new ...


Thu, 01 Nov 2007 00:50:51 GMT framm [444]
	* trunk/.settings/org.eclipse.jdt.core.prefs (modified)
	* trunk/.settings/org.eclipse.jdt.ui.prefs (modified)
	* trunk/images/layer/gpx_small.png (added)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OpenAction.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/downloadtasks/DownloadGpsTask.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx (added)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (added)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxLink.java (added)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxRoute.java (added)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java (added)
	* trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (added)
	* trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java (added)
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (deleted)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java (modified)
	* trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxReader.java (added)
	* trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/RawCsvReader.java (deleted)
	* trunk/src/org/openstreetmap/josm/io/RawGpsReader.java (deleted)

	- patch for better GPX file support by Raphael Mack <ramack@raphael- ...


Fri, 14 Sep 2007 12:44:28 GMT (none) [321]
	* trunk (added)
	* trunk/.classpath (moved)
	* trunk/.project (moved)
	* trunk/.settings (moved)
	* trunk/CONTRIBUTION (moved)
	* trunk/LICENSE (moved)
	* trunk/README (moved)
	* trunk/build.xml (moved)
	* trunk/data (moved)
	* trunk/images (moved)
	* trunk/josm.reg (moved)
	* trunk/lib (moved)
	* trunk/src (moved)
	* trunk/start.html (moved)
	* trunk/test (moved)

	- restructure of repository to support branches. Do 'svn switch ...


Wed, 08 Aug 2007 12:56:38 GMT imi [301]
	* .settings/org.eclipse.jdt.ui.prefs (modified)
	* src/org/openstreetmap/josm/Main.java (modified)
	* src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* src/org/openstreetmap/josm/actions/AlignInLineAction.java (modified)
	* src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* src/org/openstreetmap/josm/actions/RedoAction.java (modified)
	* src/org/openstreetmap/josm/actions/ReorderAction.java (modified)
	* src/org/openstreetmap/josm/actions/ReverseSegmentAction.java (modified)
	* src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* src/org/openstreetmap/josm/actions/UndoAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (modified)
	* src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* src/org/openstreetmap/josm/data/UndoRedoHandler.java (added)
	* src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)
	* src/org/openstreetmap/josm/io/IncompleteDownloader.java (modified)

	- fixed undo/redo to be global
	- fixed adding of objects work with ...