Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 15589)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 15590)
@@ -1709,5 +1709,5 @@
         }
 
-        ImageInputStream stream = createImageInputStream(input);
+        ImageInputStream stream = createImageInputStream(input); // NOPMD
         if (stream == null) {
             throw new IIOException("Can't create an ImageInputStream!");
@@ -1759,5 +1759,5 @@
         CheckParameterUtil.ensureParameterNotNull(input, "input");
 
-        ImageInputStream stream = createImageInputStream(input);
+        ImageInputStream stream = createImageInputStream(input); // NOPMD
         BufferedImage bi = read(stream, readMetadata, enforceTransparency);
         if (bi == null) {
@@ -1803,5 +1803,5 @@
 
         try (InputStream istream = Utils.openStream(input)) {
-            ImageInputStream stream = createImageInputStream(istream);
+            ImageInputStream stream = createImageInputStream(istream); // NOPMD
             BufferedImage bi = read(stream, readMetadata, enforceTransparency);
             if (bi == null) {
@@ -1854,5 +1854,5 @@
         reader.setInput(stream, true, !readMetadata && !enforceTransparency);
         BufferedImage bi = null;
-        try {
+        try { // NOPMD
             bi = reader.read(0, param);
             if (bi.getTransparency() != Transparency.TRANSLUCENT && (readMetadata || enforceTransparency) && Utils.getJavaVersion() < 11) {
Index: /trunk/src/org/openstreetmap/josm/tools/Logging.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Logging.java	(revision 15589)
+++ /trunk/src/org/openstreetmap/josm/tools/Logging.java	(revision 15590)
@@ -95,5 +95,5 @@
          */
         public synchronized void reacquireOutputStream() {
-            final OutputStream reacquiredStream = this.outputStreamSupplier.get();
+            final OutputStream reacquiredStream = this.outputStreamSupplier.get(); // NOPMD
 
             // only bother calling setOutputStream if it's actually different, as setOutputStream
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 15589)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 15590)
@@ -440,5 +440,5 @@
             File cachePath = Config.getDirs().getCacheDirectory(true);
             Path fontconfigFile = cachePath.toPath().resolve("fontconfig.properties");
-            OutputStream os = Files.newOutputStream(fontconfigFile);
+            OutputStream os = Files.newOutputStream(fontconfigFile); // NOPMD
             os.write(content);
             try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 15589)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 15590)
@@ -1470,8 +1470,9 @@
      */
     public static byte[] readBytesFromStream(InputStream stream) throws IOException {
+        // TODO: remove this method when switching to Java 11 and use InputStream.readAllBytes
         if (stream == null) {
             return new byte[0];
         }
-        try {
+        try { // NOPMD
             ByteArrayOutputStream bout = new ByteArrayOutputStream(stream.available());
             byte[] buffer = new byte[8192];