Changeset 10182 in josm for trunk/src/org

Timestamp:

2016-05-11T04:51:06+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S1943 - Classes and methods that rely on the default system encoding should not be used

File:

• trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/UTFInputStreamReader.java

@@ -9 +9 @@
 
 /**
- * Detects the different UTF encodings from byte order mark
+ * Detects the different UTF encodings from byte order mark.
+ * @since 3372
  */
 public final class UTFInputStreamReader extends InputStreamReader {
+
+    private UTFInputStreamReader(InputStream in, String cs) throws UnsupportedEncodingException {
+        super(in, cs);
+    }
 
     /**
@@ -64 +69 @@
 
         if (encoding == null) {
-            return new UTFInputStreamReader(pushbackStream);
-        } else {
-            return new UTFInputStreamReader(pushbackStream, encoding);
+            encoding = "UTF-8";
         }
-    }
-
-    private UTFInputStreamReader(InputStream in) {
-        super(in);
-    }
-
-    private UTFInputStreamReader(InputStream in, String cs) throws UnsupportedEncodingException {
-        super(in, cs);
+        return new UTFInputStreamReader(pushbackStream, encoding);
     }
 }