#
# ChangeLog for trunk in josm
#
# Generated by Trac 1.6
# 2024-11-30T06:35:29+01:00

Wed, 27 Jan 2010 21:21:17 GMT mjulius [2899]
	* trunk/.settings/org.eclipse.jdt.core.prefs (modified)
	* trunk/.settings/org.eclipse.jdt.ui.prefs (modified)
	* trunk/data/elemstyles.xml (added)
	* trunk/images/downloadurl.png (added)
	* trunk/images_nodist/downloadurl.xcf (added)
	* trunk/src/org/openstreetmap/josm/actions/DownloadUrlAction.java (added)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/DownloadUrlDialog.java (added)

	new action: DownloadUrlAction
	This opens a dialog to allow the user ...


Wed, 27 Jan 2010 20:58:17 GMT jttt [2898]
	* trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified)

	Fixed #4436 Changing bbox resets zoom after search


Wed, 27 Jan 2010 20:10:36 GMT jttt [2897]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified)

	Fixed #4404 Contents of layer-list not shown


Wed, 27 Jan 2010 19:49:59 GMT jttt [2896]
	* trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified)

	Fixed #4057 JOSM loses data on save: Approx 20% data loss of ways but ...


Tue, 26 Jan 2010 17:02:36 GMT mjulius [2895]
	* trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)

	Fix some messages


Mon, 25 Jan 2010 22:05:57 GMT bastiK [2894]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	make selected relation visible (jump to it) for:
	properties dialog ...


Mon, 25 Jan 2010 21:40:27 GMT bastiK [2893]
	* trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified)

	display admin_level in the relation list (and everywhere else a ...


Mon, 25 Jan 2010 21:15:44 GMT bastiK [2892]
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)

	fixed #3135 - ability to copy id of selected object to copy-paste
	buffer


Mon, 25 Jan 2010 14:30:51 GMT bastiK [2891]
	* trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (modified)

	Made the bbox display in the 'Bookmarks' tab of the download dialog ...


Sun, 24 Jan 2010 16:55:56 GMT bastiK [2890]
	* trunk/data_nodist/direction-arrows.osm (added)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified)

	Reverse Arrows for 'oneway=-1' and similar (see #2387).
	More ...


Sun, 24 Jan 2010 13:20:12 GMT stoecker [2889]
	* trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)

	close #4418 - support zip files for styles and presets


Sun, 24 Jan 2010 11:15:50 GMT bastiK [2888]
	* trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified)

	applied #4425 - Text fixes (patch by andre68)


Sat, 23 Jan 2010 23:50:17 GMT bastiK [2887]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified)

	fixed #4422 - wrong filename in the titlebar of the "geotagged ...


Sat, 23 Jan 2010 20:15:17 GMT bastiK [2886]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified)

	relation dialog:
	 * reverse order for selected members only;
	 * if ...


Sat, 23 Jan 2010 16:00:44 GMT bastiK [2885]
	* trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	Show in relation list if a relation has incomplete members.
	Remove ...


Sat, 23 Jan 2010 15:47:01 GMT jttt [2884]
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified)

	Get mouse position in marker layer only when necessary (speed ...


Sat, 23 Jan 2010 14:49:09 GMT jttt [2883]
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)

	Fixed #2809 Change what "interesting direction hints" means


Sat, 23 Jan 2010 13:42:25 GMT jttt [2882]
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)

	Fixed  #4409 after confict management: nodes are not selectable


Sat, 23 Jan 2010 13:24:03 GMT jttt [2881]
	* trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)

	Fixed #4412 after confict management: selecting a relation does not ...


Sat, 23 Jan 2010 09:22:15 GMT jttt [2880]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)

	Fixed #4411 Can't upload due to conflicts, but conflict list is empty


Fri, 22 Jan 2010 22:13:29 GMT jttt [2879]
	* trunk/src/org/openstreetmap/josm/data/osm/DatasetConsistencyTest.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (modified)

	Remove bogus warning in data consistency test


Tue, 19 Jan 2010 07:42:05 GMT ulfl [2878]
	* trunk/data/defaultpresets.xml (modified)

	add (based on current usage numbers and map features entries): ...


Mon, 18 Jan 2010 21:28:36 GMT mjulius [2877]
	* trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified)

	authorise --> authorize in localized messages
	fixed typo


Mon, 18 Jan 2010 20:52:10 GMT bastiK [2876]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	fix #3745 - fullscreen geometry not restored (patch by bomm)


Mon, 18 Jan 2010 19:03:38 GMT mjulius [2875]
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)

	fix some more unescaped '


Mon, 18 Jan 2010 00:00:17 GMT bastiK [2874]
	* trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified)

	use PrimaryDateParser to parse time of GPS points (for geoimage)


Sun, 17 Jan 2010 23:42:48 GMT ulfl [2873]
	* trunk/styles/standard/elemstyles.xml (modified)

	add waterway=ditch, waterway=rapids, aerialway=pylon, ...


Sun, 17 Jan 2010 16:29:00 GMT ce [2872]
	* trunk/data/defaultpresets.xml (modified)
	* trunk/images/presets/foot_and_cycleway_combined.png (added)
	* trunk/images/presets/foot_and_cycleway_segregated.png (added)

	Experimental: Added dedicated menu entries for segregated and ...


Sun, 17 Jan 2010 15:37:24 GMT jttt [2871]
	* trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)

	Partially fix situation after last layer removal - most objects still ...


Sun, 17 Jan 2010 14:44:59 GMT ce [2870]
	* trunk/data/defaultpresets.xml (modified)

	fixes #3896 - this patch is highly political and thus highly ...


Sun, 17 Jan 2010 10:56:07 GMT jttt [2869]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified)

	Removed ToggleDialog.tearDown(). All listeners should be unregistered ...


Sun, 17 Jan 2010 09:28:59 GMT jttt [2868]
	* trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified)

	Fixed #4324 New ways not displayed


Sat, 16 Jan 2010 18:51:23 GMT jttt [2867]
	* trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (modified)

	Better gpx layer tooltip, don't add gpx layer if gpx file is empty


Sat, 16 Jan 2010 12:50:36 GMT Gubaer [2866]
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	fixed #4376: Update plugins doesn't remember skipping


Sat, 16 Jan 2010 12:22:06 GMT Gubaer [2865]
	* trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (modified)

	fixed #4378: r2862 hangs on startup while processing plugin files ...


Fri, 15 Jan 2010 22:23:43 GMT stoecker [2864]
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	fixed plugin loading stages


Fri, 15 Jan 2010 20:58:46 GMT jttt [2863]
	* trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/User.java (modified)

	Fixed #4377 routes plugin search for user names defect, added boolean ...


Fri, 15 Jan 2010 10:29:36 GMT Gubaer [2862]
	* trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MissingOAuthAccessTokenException.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (modified)

	fixed #4322: No error message if trying to upload without OAuth token


Fri, 15 Jan 2010 09:44:16 GMT Gubaer [2861]
	* trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedure.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmLoginFailedException.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationException.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified)

	fixed #4375: authorise -> authorize


Thu, 14 Jan 2010 21:06:53 GMT jttt [2860]
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	Fixed #3233 Relation list doesn't update when a data layer is deleted


Thu, 14 Jan 2010 19:28:40 GMT Gubaer [2859]
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified)

	minor clean up


Thu, 14 Jan 2010 17:46:44 GMT mjulius [2858]
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	message fixes


Thu, 14 Jan 2010 17:31:10 GMT mjulius [2857]
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)

	fixed some more message contexts


Thu, 14 Jan 2010 15:31:41 GMT Gubaer [2856]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	fixed #4365: "Do you want to update plugins" request shown behind ...


Thu, 14 Jan 2010 09:26:13 GMT Gubaer [2855]
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	fixed #4364: editing an "advanced preference" will disable all ...


Wed, 13 Jan 2010 20:28:24 GMT mjulius [2854]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filters.java (modified)

	fix some translation contexts


Wed, 13 Jan 2010 19:22:11 GMT mjulius [2853]
	* trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified)

	fix messages for the rest


Wed, 13 Jan 2010 19:20:51 GMT mjulius [2852]
	* trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (modified)
	* trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified)
	* trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxExporter.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/OsmChangesetContentParser.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/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/OsmServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fix messages for io


Wed, 13 Jan 2010 19:20:07 GMT jttt [2851]
	* trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/FileImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/IllegalDataException.java (modified)
	* trunk/src/org/openstreetmap/josm/io/JpgImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NMEAImporter.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)

	Added progress monitor to JpgImporter, allow to cancel importing


Wed, 13 Jan 2010 19:15:02 GMT mjulius [2850]
	* trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/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/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (modified)

	fix messages for gui


Wed, 13 Jan 2010 19:14:22 GMT mjulius [2849]
	* trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java (modified)

	fix messages for gui/preferences


Wed, 13 Jan 2010 19:13:40 GMT mjulius [2848]
	* trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.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/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified)

	fix messages for gui/io


Wed, 13 Jan 2010 19:12:48 GMT mjulius [2847]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.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/RelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified)

	fix messages for gui/dialogs


Wed, 13 Jan 2010 19:12:10 GMT mjulius [2846]
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/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/pair/tags/TagMerger.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)

	fix messages for gui/conflict


Wed, 13 Jan 2010 18:55:07 GMT mjulius [2845]
	* trunk/src/org/openstreetmap/josm/data/Bounds.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Version.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/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filters.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/history/History.java (modified)
	* 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/data/osm/history/HistoryRelation.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/data/osm/visitor/paint/MapPaintVisitor.java (modified)

	fix messages for data


Wed, 13 Jan 2010 18:47:32 GMT mjulius [2844]
	* trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/Command.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.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/UndeletePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified)

	fix messages for commands


Wed, 13 Jan 2010 18:35:27 GMT stoecker [2843]
	* trunk/data/ar.lang (modified)
	* trunk/data/bg.lang (modified)
	* trunk/data/cs.lang (modified)
	* trunk/data/da.lang (modified)
	* trunk/data/de.lang (modified)
	* trunk/data/el.lang (modified)
	* trunk/data/en.lang (modified)
	* trunk/data/en_GB.lang (modified)
	* trunk/data/es.lang (modified)
	* trunk/data/et.lang (modified)
	* trunk/data/fi.lang (modified)
	* trunk/data/fr.lang (modified)
	* trunk/data/gl.lang (modified)
	* trunk/data/he.lang (modified)
	* trunk/data/is.lang (modified)
	* trunk/data/it.lang (modified)
	* trunk/data/ja.lang (modified)
	* trunk/data/nb.lang (modified)
	* trunk/data/nl.lang (modified)
	* trunk/data/pl.lang (modified)
	* trunk/data/pt_BR.lang (modified)
	* trunk/data/ro.lang (modified)
	* trunk/data/ru.lang (modified)
	* trunk/data/sk.lang (modified)
	* trunk/data/sl.lang (modified)
	* trunk/data/sv.lang (modified)
	* trunk/data/tr.lang (modified)
	* trunk/data/zh_TW.lang (modified)

	i18n update


Wed, 13 Jan 2010 18:33:42 GMT mjulius [2842]
	* trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AddNodeAction.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/JoinAreasAction.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/OrthogonalizeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (modified)

	fix messages for actions


Wed, 13 Jan 2010 16:42:03 GMT mjulius [2841]
	* trunk/src/org/openstreetmap/josm/tools/I18n.java (modified)

	treat all translatable strings the same in all tr*() implementations


Wed, 13 Jan 2010 16:10:56 GMT framm [2840]
	* trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (modified)

	fix msg


Wed, 13 Jan 2010 15:48:10 GMT framm [2839]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified)

	fix messages


Wed, 13 Jan 2010 09:35:53 GMT stoecker [2838]
	* trunk/data/ar.lang (modified)
	* trunk/data/bg.lang (modified)
	* trunk/data/cs.lang (modified)
	* trunk/data/da.lang (modified)
	* trunk/data/de.lang (modified)
	* trunk/data/el.lang (modified)
	* trunk/data/en.lang (modified)
	* trunk/data/en_GB.lang (modified)
	* trunk/data/es.lang (modified)
	* trunk/data/et.lang (modified)
	* trunk/data/fi.lang (modified)
	* trunk/data/fr.lang (modified)
	* trunk/data/gl.lang (modified)
	* trunk/data/he.lang (modified)
	* trunk/data/is.lang (modified)
	* trunk/data/it.lang (modified)
	* trunk/data/ja.lang (modified)
	* trunk/data/nb.lang (modified)
	* trunk/data/nl.lang (modified)
	* trunk/data/pl.lang (modified)
	* trunk/data/pt_BR.lang (modified)
	* trunk/data/ro.lang (modified)
	* trunk/data/ru.lang (modified)
	* trunk/data/sk.lang (modified)
	* trunk/data/sl.lang (modified)
	* trunk/data/sv.lang (modified)
	* trunk/data/tr.lang (modified)
	* trunk/data/zh_TW.lang (modified)

	i18n update


Wed, 13 Jan 2010 08:19:20 GMT Gubaer [2837]
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)

	see #4358


Wed, 13 Jan 2010 08:17:57 GMT stoecker [2836]
	* trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified)

	fix #4357 - wrong name for search server


Wed, 13 Jan 2010 08:15:05 GMT stoecker [2835]
	* trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (modified)

	fixed typo


Wed, 13 Jan 2010 08:11:13 GMT stoecker [2834]
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	fixed typo


Wed, 13 Jan 2010 01:12:18 GMT framm [2833]
	* trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (modified)

	translate


Tue, 12 Jan 2010 19:02:54 GMT Gubaer [2832]
	* trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified)

	fixed NPE with new location for elemstyles.xml, see r2827


Tue, 12 Jan 2010 18:30:02 GMT stoecker [2831]
	* trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (modified)

	fix #4352 - don't show not working


Tue, 12 Jan 2010 17:27:40 GMT Gubaer [2830]
	* trunk/src/org/openstreetmap/josm/plugins/Plugin.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (modified)

	fixed an ugly hack in the plugin bootstrap procedure


Tue, 12 Jan 2010 16:41:11 GMT bastiK [2829]
	* trunk/styles/standard/elemstyles.xml (modified)

	draw the combinations highway=path, bicycle=designated & ...


Tue, 12 Jan 2010 16:18:56 GMT stoecker [2828]
	* trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (modified)

	removed wrong translation calls


Tue, 12 Jan 2010 12:32:59 GMT stoecker [2827]
	* trunk/build.xml (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified)

	moved elementstyles to data directory


Tue, 12 Jan 2010 08:21:53 GMT Gubaer [2826]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified)

	fixed #2851: Proxy caching problem


Tue, 12 Jan 2010 07:58:43 GMT Gubaer [2825]
	* trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fixed #4328: No visible error message when trying to upload to a ...


Tue, 12 Jan 2010 07:08:21 GMT Gubaer [2824]
	* trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified)

	fixed #4082: Upload-Dialog shows in diseabled display
	Replaced ...


Tue, 12 Jan 2010 07:01:34 GMT Gubaer [2823]
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified)

	fixed #4325: Proxy settings field length wrong


Tue, 12 Jan 2010 06:16:18 GMT Gubaer [2822]
	* trunk/src/org/openstreetmap/josm/data/Version.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (modified)
	* trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (modified)

	see #4339: applied patch by andre68: MessageFormat fixes


Tue, 12 Jan 2010 06:11:57 GMT Gubaer [2821]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	applied #4344: patch by bomm: simplify command line processing


Tue, 12 Jan 2010 06:07:35 GMT Gubaer [2820]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	applied #4345: patch by bomm: another fix for usage message


Tue, 12 Jan 2010 05:49:00 GMT Gubaer [2819]
	* trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (modified)

	fixed #4349: Upgrading to 2818 hangs on processing plugins


Mon, 11 Jan 2010 20:25:29 GMT mjulius [2818]
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/NodeData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/WayData.java (modified)

	don't paste incomplete members
	When relations with incomplete ...


Mon, 11 Jan 2010 20:06:49 GMT Gubaer [2817]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin (added)
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java (added)
	* trunk/src/org/openstreetmap/josm/io/CacheFiles.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/Plugin.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloadException.java (added)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (added)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (deleted)
	* trunk/src/org/openstreetmap/josm/plugins/PluginException.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginListParseException.java (added)
	* trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java (added)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (deleted)
	* trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (added)
	* trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (added)

	fixed #3063: Downloading a plugin yields 3 dialogs at the same time: ...


Mon, 11 Jan 2010 19:32:35 GMT ulfl [2816]
	* trunk/styles/standard/elemstyles.xml (modified)

	fix #4069: reduce prio of access node rules (e.g. ...


Mon, 11 Jan 2010 17:57:34 GMT mjulius [2815]
	* trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (modified)

	fixed potential problem when different primitive types with same IDs ...


Mon, 11 Jan 2010 16:15:10 GMT mjulius [2814]
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (modified)

	fixes #4347 - merging 2 nodes produces ERROR


Sun, 10 Jan 2010 22:43:08 GMT stoecker [2813]
	* trunk/build.xml (modified)
	* trunk/data/defaultpresets.xml (copied)
	* trunk/presets (deleted)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	moved single presets file into data directory


Sun, 10 Jan 2010 22:26:49 GMT stoecker [2812]
	* trunk/images_nodist/presets (added)
	* trunk/images_nodist/presets/PedestrianSymbol.png (moved)
	* trunk/images_nodist/presets/aerialway_gondola.png (moved)
	* trunk/images_nodist/presets/aerialway_tramway.png (moved)
	* trunk/images_nodist/presets/archery.png (moved)
	* trunk/images_nodist/presets/boating.png (moved)
	* trunk/images_nodist/presets/bobsleigh.png (moved)
	* trunk/images_nodist/presets/boundary_stone.png (moved)
	* trunk/images_nodist/presets/bridleway.png (moved)
	* trunk/images_nodist/presets/camping_site.png (moved)
	* trunk/images_nodist/presets/caravan.png (moved)
	* trunk/images_nodist/presets/caravan3.png (moved)
	* trunk/images_nodist/presets/caravan_site.png (moved)
	* trunk/images_nodist/presets/deer.png (moved)
	* trunk/images_nodist/presets/divider.png (moved)
	* trunk/images_nodist/presets/diving.png (moved)
	* trunk/images_nodist/presets/fence.png (moved)
	* trunk/images_nodist/presets/fireplace.png (moved)
	* trunk/images_nodist/presets/fountain.png (moved)
	* trunk/images_nodist/presets/handball.png (moved)
	* trunk/images_nodist/presets/health.png (moved)
	* trunk/images_nodist/presets/helicopter.png (moved)
	* trunk/images_nodist/presets/hiking.png (moved)
	* trunk/images_nodist/presets/hillclimbing.png (moved)
	* trunk/images_nodist/presets/image.png (moved)
	* trunk/images_nodist/presets/industrial.png (moved)
	* trunk/images_nodist/presets/jeep.png (moved)
	* trunk/images_nodist/presets/jetski.png (moved)
	* trunk/images_nodist/presets/leisure.png (moved)
	* trunk/images_nodist/presets/luge.png (moved)
	* trunk/images_nodist/presets/manmade.png (moved)
	* trunk/images_nodist/presets/max_height.png (moved)
	* trunk/images_nodist/presets/max_speed.png (moved)
	* trunk/images_nodist/presets/max_weight.png (moved)
	* trunk/images_nodist/presets/max_weight_axis.png (moved)
	* trunk/images_nodist/presets/max_width.png (moved)
	* trunk/images_nodist/presets/maxspeed.png (moved)
	* trunk/images_nodist/presets/may_length.png (moved)
	* trunk/images_nodist/presets/min_speed.png (moved)
	* trunk/images_nodist/presets/minspeed.png (moved)
	* trunk/images_nodist/presets/mofa.png (moved)
	* trunk/images_nodist/presets/money.png (moved)
	* trunk/images_nodist/presets/motorway_junction.png (moved)
	* trunk/images_nodist/presets/museum.png (moved)
	* trunk/images_nodist/presets/natural.png (moved)
	* trunk/images_nodist/presets/oneway.png (moved)
	* trunk/images_nodist/presets/park_and_hike.png (moved)
	* trunk/images_nodist/presets/park_and_ride.png (moved)
	* trunk/images_nodist/presets/place.png (moved)
	* trunk/images_nodist/presets/post_office.png (moved)
	* trunk/images_nodist/presets/power_wind.png (moved)
	* trunk/images_nodist/presets/pubinstitutes.png (moved)
	* trunk/images_nodist/presets/railwaypoint.png (moved)
	* trunk/images_nodist/presets/roadattributes.png (moved)
	* trunk/images_nodist/presets/routes.png (moved)
	* trunk/images_nodist/presets/sailing.png (moved)
	* trunk/images_nodist/presets/services.png (moved)
	* trunk/images_nodist/presets/skating.png (moved)
	* trunk/images_nodist/presets/skiing.png (moved)
	* trunk/images_nodist/presets/skiing_cross_country.png (moved)
	* trunk/images_nodist/presets/source.png (moved)
	* trunk/images_nodist/presets/sports.png (moved)
	* trunk/images_nodist/presets/suitcase.png (moved)
	* trunk/images_nodist/presets/swimming_indoor.png (moved)
	* trunk/images_nodist/presets/tennisball.png (moved)
	* trunk/images_nodist/presets/tower_communications.png (moved)
	* trunk/images_nodist/presets/train.png (moved)
	* trunk/images_nodist/presets/truck.png (moved)
	* trunk/images_nodist/presets/waste_container.png (moved)
	* trunk/images_nodist/presets/waterpoint.png (moved)

	(re-)moved unused icons


Sun, 10 Jan 2010 22:16:45 GMT stoecker [2811]
	* trunk/geticons.pl (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified)

	fixed image recognition script


Sun, 10 Jan 2010 21:37:59 GMT stoecker [2810]
	* trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified)

	fixed typo - closes #4341


Sun, 10 Jan 2010 18:52:22 GMT jttt [2809]
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)

	Use image without alpha for offscreen buffer. Seems to the same thing ...


Sun, 10 Jan 2010 15:49:37 GMT stoecker [2808]
	* trunk/geticons.pl (added)
	* trunk/images_nodist/tagimages.png (moved)
	* trunk/images_nodist/uploadtrace.png (moved)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java (modified)

	first version of a tool to detect icon usage, does not yet detect all ...


Sun, 10 Jan 2010 15:23:38 GMT mjulius [2807]
	* trunk/src/org/openstreetmap/josm/tools/I18n.java (modified)

	better version of r2802 - don't try to load languages that are not ...


Sun, 10 Jan 2010 13:11:24 GMT stoecker [2806]
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (modified)

	fixed typo - closes #4332


Sun, 10 Jan 2010 12:24:25 GMT jttt [2805]
	* trunk/src/org/openstreetmap/josm/data/Bounds.java (modified)

	Use double instead of latlon (slightly faster)


Sun, 10 Jan 2010 11:46:10 GMT stoecker [2804]
	* trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified)

	typos


Sun, 10 Jan 2010 10:02:03 GMT stoecker [2803]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/I18n.java (modified)

	revert last checkin - it does not take sub translations into account


Sun, 10 Jan 2010 04:14:38 GMT mjulius [2802]
	* trunk/src/org/openstreetmap/josm/tools/I18n.java (modified)

	don't try to load languages that are not included in I18n.languages


Sat, 09 Jan 2010 22:38:57 GMT stoecker [2801]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (modified)
	* trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (modified)
	* trunk/src/org/openstreetmap/josm/data/oauth/OsmPrivileges.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedure.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/AuthorisationProcedureComboBox.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorisationWizard.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmLoginFailedException.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationClient.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorisationException.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorisationUI.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified)
	* trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (modified)
	* trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerFactory.java (modified)
	* trunk/src/org/openstreetmap/josm/io/auth/CredentialsManagerResponse.java (modified)
	* trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (modified)
	* trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (modified)

	fixed line endings of recent checkins


Sat, 09 Jan 2010 22:31:53 GMT stoecker [2800]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	fix commandline help - closes #4312 - patch by bomm