Changeset 34835 in osm for applications/editors/josm/plugins/o5m/src/org/openstreetmap

Timestamp:

2019-01-17T07:55:16+01:00 (6 years ago)

Author:

gerdp

Message:

improve code base on findbugs + sonar results

File:

• applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java (modified) (21 diffs)

applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39 +40 @@
  */
 public class O5mReader extends AbstractReader {
-    public IllegalDataException exception = null;
+    private IllegalDataException exception = null;
     private boolean discourageUpload;
     
@@ -80 +81 @@
     private BufferedInputStream fis;
     private InputStream is;
-    private ByteArrayInputStream bis;
 
     // buffer for byte -> String conversions
@@ -94 +94 @@
     private int bytesToRead;
     // total number of bytes read from stream
-    long countBytes;
+    private long countBytes;
 
     // for delta calculations
@@ -103 +103 @@
     private long lastTs;
     private long lastChangeSet;
-    private int lastLon, lastLat;
+    private int lastLon;
+    private int lastLat;
     private int version;
     private User osmUser;
@@ -175 +176 @@
                     } 
                     ioPos = 0;
-                    bis = new ByteArrayInputStream(ioBuf, 0, bytesToRead);
-                    is = bis;
+                    is = new ByteArrayInputStream(ioBuf, 0, bytesToRead);
                     break;                    
-                default:    
+                default: break;    
                 }
             }
@@ -229 +229 @@
             ds.addDataSource(new DataSource(b, header));
         } else {
-            Logging.error("Invalid Bounds: "+b);
+            Logging.error("Invalid Bounds: " + b);
         }
     }
@@ -235 +235 @@
     /**
      * read a node data set 
-     * @throws IOException in case of I/O error
-     */
-    private void readNode() throws IOException {
+     */
+    private void readNode() {
         if (exception != null)
             return;
@@ -285 +284 @@
     /**
      * read a way data set
-     * @throws IOException in case of I/O error
-     */
-    private void readWay() throws IOException {
+     */
+    private void readWay() {
         if (exception != null)
             return;
@@ -333 +331 @@
     /**
      * read a relation data set
-     * @throws IOException in case of I/O error
-     */
-    private void readRel() throws IOException {
+     */
+    private void readRel() {
         if (exception != null)
             return;
@@ -387 +384 @@
     }
 
-    private Map<String, String> readTags() throws IOException {
+    private Map<String, String> readTags() {
         Map<String, String> keys = new HashMap<>();
         while (bytesToRead > 0) {
@@ -424 +421 @@
      * Read version, time stamp and change set and author.  
      * We are not interested in the values, but we have to maintain the string table.
-     * @throws IOException in case of I/O error
-     */
-    private void readVersionTsAuthor() throws IOException {
+     */
+    private void readVersionTsAuthor() {
         stringPair[0] = null;
         stringPair[1] = null;
@@ -442 +438 @@
     /**
      * Read author . 
-     * @throws IOException in case of I/O error
-     */
-    private void readAuthor() throws IOException {
+     */
+    private void readAuthor() {
         int stringRef = readUnsignedNum32();
         if (stringRef == 0) {
@@ -465 +460 @@
 
                 if (b == 0)
-                    stringPair[1] = new String(cnvBuffer, start, buffPos-1, "UTF-8");
+                    stringPair[1] = new String(cnvBuffer, start, buffPos-1, StandardCharsets.UTF_8);
             }
             long bytes = toReadStart - bytesToRead;
@@ -472 +467 @@
         } else 
             setStringRefPair(stringRef);
-        if (stringPair[0] != null && stringPair[0].isEmpty() == false) {
+        if (stringPair[0] != null && !stringPair[0].isEmpty()) {
             long uid = Long.parseLong(stringPair[0]);
             osmUser = User.createOsmUser(uid, stringPair[1]);
@@ -482 +477 @@
      * read object type ("0".."2") concatenated with role (single string) 
      * @return 0..3 for type (3 means unknown)
-     * @throws IOException in case of I/O error
-     */
-    private int readRelRef() throws IOException {
+     */
+    private int readRelRef() {
         int refType = -1;
         long toReadStart = bytesToRead;
@@ -505 +499 @@
 
                 if (b == 0)
-                    stringPair[1] = new String(cnvBuffer, start, buffPos-1, "UTF-8");
+                    stringPair[1] = new String(cnvBuffer, start, buffPos-1, StandardCharsets.UTF_8);
             }
             long bytes = toReadStart - bytesToRead;
@@ -525 +519 @@
     /**
      * read a string pair (see o5m definition)
-     * @throws IOException in case of I/O error
-     */
-    private void readStringPair() throws IOException {
+     */
+    private void readStringPair() {
         int stringRef = readUnsignedNum32();
         if (stringRef == 0) {
@@ -540 +533 @@
 
                 if (b == 0) {
-                    stringPair[cnt] = new String(cnvBuffer, start, buffPos-start-1, "UTF-8");
+                    stringPair[cnt] = new String(cnvBuffer, start, buffPos-start-1, StandardCharsets.UTF_8);
                     ++cnt;
                     start = buffPos;
@@ -570 +563 @@
             throw new IOException(tr("unsupported header"));
         }
-        header = new String(ioBuf, 0, 3, "UTF-8");
+        header = new String(ioBuf, 0, 3, StandardCharsets.UTF_8);
     }
 
@@ -707 +700 @@
      * Exception thrown after user cancellation.
      */
+    @SuppressWarnings("serial")
     private static final class O5mParsingCancelException extends Exception implements ImportCancelException {
         O5mParsingCancelException(String msg) {