#
# ChangeLog for trunk/src/org in josm
#
# Generated by Trac 1.6
# 2024-12-02T14:30:38+01:00

Tue, 14 Feb 2017 22:23:35 GMT michael2402 [11564]
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (modified)

	See #14370: Allow a(lpha), b(eta) in plugin version names as well. ...


Tue, 14 Feb 2017 22:15:33 GMT Don-vip [11563]
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (modified)

	fix #14370 - plugin list import function has trouble with more ...


Tue, 14 Feb 2017 22:00:03 GMT Don-vip [11562]
	* trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactoryTest.java (added)

	fix #14368 - java.util.regex.PatternSyntaxException: Unclosed group


Mon, 13 Feb 2017 23:32:15 GMT Don-vip [11560]
	* trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified)

	fix #14364 - Overpass wizard geocoding doesn't interpret Nominatim ...


Mon, 13 Feb 2017 23:21:56 GMT Don-vip [11559]
	* trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified)

	fix #14361 - WMTS: download only supported image formats


Mon, 13 Feb 2017 22:16:01 GMT Don-vip [11558]
	* trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified)

	fix #14359 - use correct listener to avoid spurious events called ...


Mon, 13 Feb 2017 21:39:50 GMT Don-vip [11557]
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)

	fix #14363 - proper handling of InterruptedException to avoid ...


Mon, 13 Feb 2017 09:29:08 GMT stoecker [11556]
	* trunk/src/org/openstreetmap (modified)

	OSM SVN enforces now HTTPS


Sun, 12 Feb 2017 17:53:26 GMT Don-vip [11555]
	* trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (modified)

	see #14346 - checkstyle


Sun, 12 Feb 2017 15:41:53 GMT Don-vip [11554]
	* trunk/src/org/openstreetmap/josm/actions/AbstractPasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java (modified)

	fix #14356 - make sure that workaround for JDK-6322854 is used
	everywhere


Sun, 12 Feb 2017 15:32:18 GMT Don-vip [11553]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified)
	* trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrackSegment.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/TagMap.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified)
	* trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (modified)
	* trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java (modified)
	* trunk/src/org/openstreetmap/josm/data/preferences/PreferencesWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/Test.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapMover.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapViewState.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/dialogs/LatLonDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.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/io/CloseChangesetTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadNoteLayerTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Link.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/util/CursorManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.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/NmeaReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NoteReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (modified)
	* trunk/src/org/openstreetmap/josm/io/StreamProgressUpdater.java (modified)
	* trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/XmlStreamParsingException.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified)

	refactor handling of null values - use Java 8 `Optional` where
	possible


Sun, 12 Feb 2017 11:51:09 GMT Don-vip [11552]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java (modified)

	fix #14353 - robustness to systems not defining standard Java UI ...


Sat, 11 Feb 2017 19:25:23 GMT Don-vip [11551]
	* trunk/src/org/openstreetmap/josm/gui/MainPanel.java (modified)

	fix #14353 - add synchronization to MainPanel


Fri, 10 Feb 2017 14:44:42 GMT bastiK [11549]
	* trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java (modified)

	applied #14346 Rotation angle for Transverse Mercator projection ...


Thu, 09 Feb 2017 00:07:26 GMT Don-vip [11546]
	* trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java (modified)

	sonar - squid:S899 - Return values should not be ignored when they ...


Thu, 09 Feb 2017 00:02:52 GMT Don-vip [11545]
	* trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified)

	sonar - squid:S2197 - Modulus results should not be checked for ...


Wed, 08 Feb 2017 23:54:57 GMT Don-vip [11544]
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified)

	sonar - squid:S1854 - Dead stores should be removed


Tue, 07 Feb 2017 21:00:43 GMT stoecker [11542]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/preferences/ColorProperty.java (modified)

	null colors never worked in preferences and don't make much sense


Sat, 04 Feb 2017 15:19:52 GMT Don-vip [11539]
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplayTest.java (added)

	add unit test


Sat, 04 Feb 2017 14:39:06 GMT Don-vip [11538]
	* trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/Pair.java (modified)

	sonar - fb-contrib:ISB_TOSTRING_APPENDING - Correctness - Method ...


Sat, 04 Feb 2017 14:31:22 GMT Don-vip [11537]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (modified)

	sonar - fb-contrib:CCNE_COMPARE_CLASS_EQUALS_NAME - Correctness - ...


Sat, 04 Feb 2017 14:26:23 GMT Don-vip [11536]
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)

	sonar - fb-contrib:WOC_WRITE_ONLY_COLLECTION_FIELD - Correctness - ...


Sat, 04 Feb 2017 14:19:54 GMT Don-vip [11535]
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractChangesetDownloadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (modified)
	* trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/FileWatcher.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java (modified)

	sonar - squid:S2142 - "InterruptedException" should not be ignored


Sat, 04 Feb 2017 13:47:39 GMT Don-vip [11534]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapScaler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (modified)

	sonar - fb-contrib:FCBL_FIELD_COULD_BE_LOCAL - Correctness - Class ...


Sat, 04 Feb 2017 00:51:01 GMT Don-vip [11533]
	* trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified)

	fix regression from r11516 - get() does not throw the same exception ...


Fri, 03 Feb 2017 20:30:20 GMT stoecker [11532]
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	see #9210 - remove interim imagery blacklist solution, the api now ...


Fri, 03 Feb 2017 20:22:56 GMT stoecker [11531]
	* trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified)

	unify defaults (remove warning)


Fri, 03 Feb 2017 17:20:13 GMT Klumbumbus [11530]
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)

	OpenStreetCam plugin replaced OpenStreetView plugin


Thu, 02 Feb 2017 17:52:55 GMT stoecker [11528]
	* trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified)

	drop imagery entries which have an id, but are no longer in default ...


Thu, 02 Feb 2017 17:52:17 GMT stoecker [11527]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified)

	drop imagery entries which have an id, but are no longer in default
	list


Tue, 31 Jan 2017 23:45:49 GMT Don-vip [11523]
	* trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified)

	capabilities: update javadoc to new default values, code cleanup


Tue, 31 Jan 2017 22:41:26 GMT Don-vip [11522]
	* trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java (modified)

	sonar - fb-contrib:NAB_NEEDLESS_BOXING_VALUEOF - Performance - Method ...


Tue, 31 Jan 2017 22:40:09 GMT Don-vip [11521]
	* trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (modified)

	sonar - fb-contrib:ISB_INEFFICIENT_STRING_BUFFERING - Performance - ...


Tue, 31 Jan 2017 22:38:13 GMT Don-vip [11520]
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified)

	sonar - fb-contrib:ITU_INAPPROPRIATE_TOSTRING_USE - Correctness - ...


Tue, 31 Jan 2017 22:27:09 GMT Don-vip [11519]
	* trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java (modified)

	sonar - fb-contrib:PDP_POORLY_DEFINED_PARAMETER - Correctness - ...


Tue, 31 Jan 2017 22:15:20 GMT Don-vip [11518]
	* trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified)

	sonar - fb-contrib:NAB_NEEDLESS_BOXING_PARSE - Performance - Method ...


Tue, 31 Jan 2017 22:00:21 GMT Don-vip [11517]
	* trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (modified)

	sonar - fb-contrib:OC_OVERZEALOUS_CASTING - Correctness - Method ...


Tue, 31 Jan 2017 21:58:50 GMT Don-vip [11516]
	* trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified)

	sonar - fb-contrib:SPP_USE_GET0 - Performance - Method uses ...


Mon, 30 Jan 2017 22:21:38 GMT Don-vip [11514]
	* trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified)
	* trunk/test/data/regress/14209/7VWFOryj--.1.jpg (added)
	* trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified)

	fix #14209 - EXIF: prefer DATETIME over DATETIME_DIGITIZED


Sun, 29 Jan 2017 22:58:49 GMT Don-vip [11510]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (modified)

	sonar - fb-contrib:ACEM_ABSTRACT_CLASS_EMPTY_METHODS


Sun, 29 Jan 2017 18:24:14 GMT Don-vip [11509]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	fix #14305 - allow `file://` URL for command-line argument `--load- ...


Sun, 29 Jan 2017 03:29:01 GMT Don-vip [11508]
	* trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified)

	fix #14282 - add robustness to GPX settings panel (patch by kidelo)


Fri, 27 Jan 2017 01:24:04 GMT Don-vip [11506]
	* trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (modified)

	simplify MenuScroller


Fri, 27 Jan 2017 01:12:55 GMT Don-vip [11505]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java (modified)
	* trunk/test/data/regress/4539 (added)
	* trunk/test/data/regress/4539/josm_error_#4539.osm.zip (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/DuplicateActionTest.java (added)

	add non-regression unit test for #4539


Wed, 25 Jan 2017 21:42:55 GMT Don-vip [11503]
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)

	see #14264 - checkstyle


Wed, 25 Jan 2017 21:37:16 GMT Don-vip [11502]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java (modified)

	findbugs - SIC_INNER_SHOULD_BE_STATIC_ANON


Wed, 25 Jan 2017 18:04:27 GMT Klumbumbus [11499]
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)

	fix #14264 - displaying oneway direction arrows of aerialways ...


Wed, 25 Jan 2017 17:49:05 GMT Don-vip [11498]
	* trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified)

	status report: Remove jnlpx.vmargs (base64 encoded copy of VM ...


Wed, 25 Jan 2017 13:57:02 GMT Don-vip [11496]
	* trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (modified)

	findbugs - URF_UNREAD_FIELD


Wed, 25 Jan 2017 13:51:50 GMT Don-vip [11495]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java (added)

	extract DrawAction.SnapHelper to a new class


Wed, 25 Jan 2017 13:12:07 GMT Don-vip [11493]
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/Utils.java (modified)
	* trunk/test/data/regress/12627 (added)
	* trunk/test/data/regress/12627/overlapping.osm (added)
	* trunk/test/data/regress/14289 (added)
	* trunk/test/data/regress/14289/example2.osm (added)
	* trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified)

	see #12627, see #14289 - add non regression unit tests


Wed, 25 Jan 2017 01:17:36 GMT Don-vip [11490]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	copy/paste error in comment


Wed, 25 Jan 2017 01:15:11 GMT Don-vip [11489]
	* trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified)

	error-prone - enums should be immutable, and cannot have non-final
	fields


Sun, 22 Jan 2017 20:57:07 GMT michael2402 [11488]
	* trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified)

	Fix #14229: Create notification in UI thread.


Sun, 22 Jan 2017 18:14:12 GMT Don-vip [11486]
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (modified)
	* trunk/test/data/regress/14275 (added)
	* trunk/test/data/regress/14275/1485101437.8189685.gpx (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified)

	fix #14275 - robustness against invalid timestamps in GPX files


Sat, 21 Jan 2017 08:59:53 GMT wiktorn [11485]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	Fix NPE in RelationEditor

	Handle uncommon situation that user has ...


Thu, 19 Jan 2017 22:34:17 GMT Don-vip [11484]
	* trunk/src/org/openstreetmap/josm/tools/ExifReader.java (modified)
	* trunk/test/data/regress/14209 (added)
	* trunk/test/data/regress/14209/0MbEfj1S--.1.jpg (added)
	* trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified)

	fix #14209 - prefer TAG_DATETIME_ORIGINAL (patch by holgermappt, ...


Thu, 19 Jan 2017 22:23:35 GMT Don-vip [11483]
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified)

	fix #14247 - add icon as a visual indication of chosen gpx heatmap ...


Thu, 19 Jan 2017 22:14:59 GMT Don-vip [11482]
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)

	see #13124 - fix the problem with the different projections (patch by ...


Wed, 18 Jan 2017 08:04:51 GMT Don-vip [11481]
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)

	sonar - squid:S3518 - Zero should not be a possible denominator


Wed, 18 Jan 2017 07:59:02 GMT Don-vip [11480]
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	sonar - squid:S2221 - "Exception" should not be caught when not ...


Tue, 17 Jan 2017 12:50:51 GMT bastiK [11475]
	* trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java (modified)

	see #14252 - better wording in validator message


Tue, 17 Jan 2017 12:35:00 GMT bastiK [11474]
	* trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified)

	fixed #14244 - Expand combobox in preferences; add translation
	context


Mon, 16 Jan 2017 22:21:57 GMT Don-vip [11472]
	* trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified)

	fix #14257 - NPE


Mon, 16 Jan 2017 21:34:15 GMT bastiK [11470]
	* trunk/src/org/openstreetmap/josm/gui/MapViewState.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)

	see #13124 - better cache invalidation

	Fixes a problem when zoomed ...


Mon, 16 Jan 2017 21:10:58 GMT bastiK [11469]
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)

	see #13124 - fix some Heat Map issues (patch by kidelo)


Mon, 16 Jan 2017 16:00:33 GMT bastiK [11466]
	* trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)

	fixed #14252 - do not translate relation roles; add apostrophes


Sun, 15 Jan 2017 12:48:38 GMT Klumbumbus [11464]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)

	fix #14243 - typo in tool tip


Sat, 14 Jan 2017 20:10:48 GMT Klumbumbus [11463]
	* trunk/data/defaultpresets.xml (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified)

	* fix #14239 - typo in documentation (patch by skyper)
	* fix #14236 ...


Thu, 12 Jan 2017 22:28:57 GMT Don-vip [11462]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified)

	sonar - squid:S1871 - Two branches in the same conditional structure ...


Thu, 12 Jan 2017 01:36:14 GMT Don-vip [11461]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/preferences/MapListSetting.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (modified)

	sonar - fb-contrib:SPP_USE_CONTAINSKEY - Style - Method calls ...


Thu, 12 Jan 2017 01:31:00 GMT Don-vip [11460]
	* trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified)

	sonar - fb-contrib:COM_COPIED_OVERRIDDEN_METHOD - Style - Method is ...


Thu, 12 Jan 2017 01:28:28 GMT Don-vip [11459]
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)

	sonar - squid:UselessParenthesesCheck - Useless parentheses around ...


Thu, 12 Jan 2017 01:25:41 GMT Don-vip [11457]
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ShowThumbnailAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (modified)

	sonar - fb-contrib:IMC_IMMATURE_CLASS_IDE_GENERATED_PARAMETER_NAMES - ...


Thu, 12 Jan 2017 01:15:33 GMT Don-vip [11456]
	* trunk/src/org/openstreetmap/josm/io/NoteExporter.java (modified)

	sonar - squid:S2095 - Resources should be closed


Thu, 12 Jan 2017 01:09:49 GMT Don-vip [11455]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	sonar - findsecbugs:UNENCRYPTED_SOCKET - Security - Unencrypted
	Socket


Thu, 12 Jan 2017 00:42:44 GMT Don-vip [11454]
	* trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified)

	sonar - fb-contrib:NAB_NEEDLESS_BOOLEAN_CONSTANT_CONVERSION - ...


Thu, 12 Jan 2017 00:38:04 GMT Don-vip [11453]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (modified)
	* trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NoteReader.java (modified)

	sonar - fb-contrib:BED_BOGUS_EXCEPTION_DECLARATION - Correctness - ...


Thu, 12 Jan 2017 00:24:40 GMT Don-vip [11452]
	* trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/conflict/DeletedStateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/BBox.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NameFinder.java (modified)
	* trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (modified)

	sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - ...


Wed, 11 Jan 2017 19:06:51 GMT Don-vip [11451]
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)

	fix #13124 - Heat Map Extension (patch by kidelo)


Mon, 09 Jan 2017 22:57:47 GMT Don-vip [11447]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/test/data/regress/14217 (added)
	* trunk/test/data/regress/14217/filter.txt (added)
	* trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java (modified)

	fix #14217 - replace recursive filter parsing by iterative approach ...


Mon, 09 Jan 2017 18:00:10 GMT stoecker [11446]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)

	add search option to find deleted objects (e.g. to purge them)


Mon, 09 Jan 2017 07:59:03 GMT Don-vip [11445]
	* trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java (modified)

	checkstyle


Sun, 08 Jan 2017 23:34:05 GMT wiktorn [11444]
	* trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java (added)

	Fix disappearing download tasks.

	When ThreadPoolExecutor is ...


Sun, 08 Jan 2017 15:53:49 GMT Don-vip [11443]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)

	fix #14211, see #11924 - InaccessibleObjectException with JDK 9 b148+


Sat, 07 Jan 2017 16:19:05 GMT Don-vip [11441]
	* trunk/src/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWay.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SelfIntersectingWayTest.java (modified)

	fix #14202 - fix self-intersecting way test (patch by GerdP)


Sat, 07 Jan 2017 16:15:00 GMT Don-vip [11440]
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (modified)

	fix #14186 - ConcurrentModificationException in QuadBucketIterator ...


Sat, 07 Jan 2017 08:44:59 GMT wiktorn [11438]
	* trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSSettingsPanel.java (modified)

	Fix thread pool for WMS

	Because threds in WMS download ThreadPool ...


Sat, 07 Jan 2017 00:15:43 GMT Don-vip [11436]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified)

	fix recent Sonar issues


Fri, 06 Jan 2017 23:56:52 GMT Don-vip [11435]
	* trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/Utils.java (modified)
	* trunk/test/data/regress/14199 (added)
	* trunk/test/data/regress/14199/emptytag.osm (added)
	* trunk/test/unit/org/openstreetmap/josm/io/OsmReaderTest.java (added)
	* trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified)

	fix #14199 - JOSM drops empty tags on loading and thus prevents ...


Fri, 06 Jan 2017 20:06:38 GMT Don-vip [11434]
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified)

	fix #14181 - GeoImageLayer: Improvements of display of selected photo ...


Fri, 06 Jan 2017 19:47:12 GMT Don-vip [11432]
	* trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java (modified)

	fix #14093 - don't autofix "Missing power tower/pole within power ...


Fri, 06 Jan 2017 19:26:55 GMT Don-vip [11431]
	* trunk/data/gpx (added)
	* trunk/data/gpx/brown2green.txt (added)
	* trunk/data/gpx/inferno.txt (added)
	* trunk/data/gpx/red2blue.txt (added)
	* trunk/data/gpx/viridis.txt (added)
	* trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified)

	fix #13124 - Enhanced GPS data rendering: add new heatmap mode (patch ...


Sun, 01 Jan 2017 23:53:29 GMT Don-vip [11427]
	* trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (modified)

	fix #14185 - see #10511 - robustness when joining algorithm fails ...


Sat, 31 Dec 2016 16:39:03 GMT Don-vip [11425]
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified)

	fix #14179 - remove duplicated code


Sat, 31 Dec 2016 16:29:54 GMT Don-vip [11424]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)

	fix #10387, fix #12914 - enable territorial rules by default


Fri, 30 Dec 2016 23:04:03 GMT stoecker [11421]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified)

	fix #13919 - image size mismatch


Tue, 27 Dec 2016 13:50:47 GMT stoecker [11419]
	* trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java (modified)

	fix #14164, typo in preferences string - patch by ToeBee


Fri, 23 Dec 2016 14:34:59 GMT Don-vip [11418]
	* trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (modified)

	update TLD from IANA


Fri, 23 Dec 2016 14:30:46 GMT Don-vip [11417]
	* trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java (modified)

	fix #14152 - NPE