Changeset 6246 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2013-09-22T18:36:07+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - various bugfixes / violation fixes

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioPlayer.java (modified) (1 diff)
• Diff.java (modified) (27 diffs)
• Geometry.java (modified) (1 diff)
• ImageProvider.java (modified) (2 diffs)
• TextTagParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -305 +305 @@
                                         bytesToSkip -= nBytesRead;
                                     }
-                                    if (bytesToSkip > 0) {
-                                        audioInputStream.skip(bytesToSkip);
+                                    while (bytesToSkip > 0) {
+                                        long skippedBytes = audioInputStream.skip(bytesToSkip);
+                                        bytesToSkip -= skippedBytes;
+                                        if (skippedBytes == 0) {
+                                            // Avoid inifinite loop
+                                            Main.warn("Unable to skip bytes from audio input stream");
+                                            bytesToSkip = 0;
+                                        }
                                     }
                                     position = offset;

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -97 +97 @@
     public Diff(Object[] a,Object[] b) {
         Map<Object,Integer> h = new HashMap<Object,Integer>(a.length + b.length);
-        filevec = new file_data[] { new file_data(a,h),new file_data(b,h) };
+        filevec = new FileData[] { new FileData(a,h),new FileData(b,h) };
     }
 
@@ -123 +123 @@
                    search of the edit matrix. */
     private int fdiagoff, bdiagoff;
-    private final file_data[] filevec;
+    private final FileData[] filevec;
     private int cost;
     /** Snakes bigger than this are considered "big". */
@@ -358 +358 @@
                 filevec[0].changed_flag[1+filevec[0].realindexes[xoff++]] = true;
             }
-        } else
-        {
+        } else {
             /* Find a point of correspondence in the middle of the files.  */
 
@@ -378 +377 @@
                 compareseq (xoff, b, yoff, b - d);
                 /* This used to use f instead of b,
-           but that is incorrect!
-           It is not necessarily the case that diagonal d
-           has a snake from b to f.  */
+                   but that is incorrect!
+                   It is not necessarily the case that diagonal d
+                   has a snake from b to f.  */
                 compareseq (b, xlim, b - d, ylim);
             }
@@ -388 +387 @@
     /** Discard lines from one file that have no matches in the other file.
      */
-
     private void discard_confusing_lines() {
         filevec[0].discard_confusing_lines(filevec[1]);
@@ -397 +395 @@
 
     /** Adjust inserts/deletes of blank lines to join changes
-     as much as possible.
+        as much as possible.
      */
-
     private void shift_boundaries() {
         if (inhibit)
@@ -409 +406 @@
     public interface ScriptBuilder {
         /** Scan the tables of which lines are inserted and deleted,
-     producing an edit script.
-   @param changed0 true for lines in first file which do not match 2nd
-   @param len0 number of lines in first file
-   @param changed1 true for lines in 2nd file which do not match 1st
-   @param len1 number of lines in 2nd file
-   @return a linked list of changes - or null
+            producing an edit script.
+            @param changed0 true for lines in first file which do not match 2nd
+            @param len0 number of lines in first file
+            @param changed1 true for lines in 2nd file which do not match 1st
+            @param len1 number of lines in 2nd file
+            @return a linked list of changes - or null
          */
-        public change build_script(
+        public Change build_script(
                 boolean[] changed0,int len0,
                 boolean[] changed1,int len1
@@ -427 +424 @@
     static class ReverseScript implements ScriptBuilder {
         @Override
-        public  change build_script(
+        public  Change build_script(
                 final boolean[] changed0,int len0,
                 final boolean[] changed1,int len1)
         {
-            change script = null;
+            Change script = null;
             int i0 = 0, i1 = 0;
             while (i0 < len0 || i1 < len1) {
@@ -446 +443 @@
 
                     /* Record this change.  */
-                    script = new change(line0, line1, i0 - line0, i1 - line1, script);
+                    script = new Change(line0, line1, i0 - line0, i1 - line1, script);
                 }
 
@@ -459 +456 @@
     static class ForwardScript implements ScriptBuilder {
         /** Scan the tables of which lines are inserted and deleted,
-       producing an edit script in forward order.  */
+            producing an edit script in forward order.  */
         @Override
-        public change build_script(
+        public Change build_script(
                 final boolean[] changed0,int len0,
                 final boolean[] changed1,int len1)
         {
-            change script = null;
+            Change script = null;
             int i0 = len0, i1 = len1;
 
@@ -483 +480 @@
 
                     /* Record this change.  */
-                    script = new change(i0, i1, line0 - i0, line1 - i1, script);
+                    script = new Change(i0, i1, line0 - i0, line1 - i1, script);
                 }
 
@@ -499 +496 @@
     reverseScript = new ReverseScript();
 
-    /* Report the differences of two files.  DEPTH is the current directory
-     depth. */
-    public final change diff_2(final boolean reverse) {
+    /** Report the differences of two files.  DEPTH is the current directory
+        depth. */
+    public final Change diff_2(final boolean reverse) {
         return diff(reverse ? reverseScript : forwardScript);
     }
@@ -513 +510 @@
      @return the head of a list of changes
      */
-    public change diff(final ScriptBuilder bld) {
+    public Change diff(final ScriptBuilder bld) {
 
         /* Some lines are obviously insertions or deletions
@@ -566 +563 @@
      which the insertion was done; vice versa for INSERTED and LINE1.  */
 
-    public static class change {
+    public static class Change {
         /** Previous or next edit command. */
-        public change link;
+        public Change link;
         /** # lines of file 1 changed here.  */
         public final int inserted;
@@ -577 +574 @@
         /** Line number of 1st inserted line.  */
         public final int line1;
-        /** Change is ignorable. */
-        public boolean ignore;
 
         /** Cons an additional entry onto the front of an edit script OLD.
@@ -587 +582 @@
        If DELETED is 0 then LINE0 is the number of the line before
        which the insertion was done; vice versa for INSERTED and LINE1.  */
-        public change(int line0, int line1, int deleted, int inserted, change old) {
+        public Change(int line0, int line1, int deleted, int inserted, Change old) {
             this.line0 = line0;
             this.line1 = line1;
@@ -604 +599 @@
      */
 
-    class file_data {
+    class FileData {
 
         /** Allocate changed array for the results of comparison.  */
         void clear() {
             /* Allocate a flag for each line of each file, saying whether that line
-     is an insertion or deletion.
-     Allocate an extra element, always zero, at each end of each vector.
+               is an insertion or deletion.
+               Allocate an extra element, always zero, at each end of each vector.
              */
             changed_flag = new boolean[buffered_lines + 2];
@@ -616 +611 @@
 
         /** Return equiv_count[I] as the number of lines in this file
-       that fall in equivalence class I.
+         that fall in equivalence class I.
          @return the array of equivalence class counts.
          */
@@ -640 +635 @@
       @param f the other file
          */
-        void discard_confusing_lines(file_data f) {
+        void discard_confusing_lines(FileData f) {
             clear();
             /* Set up table of which lines are going to be discarded. */
@@ -729 +724 @@
 
                     /* Now we have the length of a run of discardable lines
-           whose first and last are not provisional.  */
+                       whose first and last are not provisional.  */
                     length = j - i;
 
                     /* If 1/4 of the lines in the run are provisional,
-           cancel discarding of all provisional lines in the run.  */
-                    if (provisional * 4 > length)
-                    {
+                       cancel discarding of all provisional lines in the run.  */
+                    if (provisional * 4 > length) {
                         while (j > i)
                             if (discards[--j] == 2) {
                                 discards[j] = 0;
                             }
-                    }
-                    else
-                    {
+                    } else {
                         int consec;
                         int minimum = 1;
@@ -817 +809 @@
 
         /** Actually discard the lines.
-      @param discards flags lines to be discarded
+            @param discards flags lines to be discarded
          */
         private void discard(final byte[] discards) {
@@ -833 +825 @@
         }
 
-        file_data(int[] data) {
+        FileData(int[] data) {
             buffered_lines = data.length;
             equivs = data;
@@ -840 +832 @@
         }
         
-        file_data(Object[] data,Map<Object,Integer> h) {
+        FileData(Object[] data,Map<Object,Integer> h) {
             this(new int[data.length]);
             // FIXME: diff 2.7 removes common prefix and common suffix
@@ -866 +858 @@
          */
 
-        void shift_boundaries(file_data f) {
+        void shift_boundaries(FileData f) {
             final boolean[] changed = changed_flag;
             final boolean[] other_changed = f.changed_flag;
@@ -909 +901 @@
 
                     /* If the first changed line matches the following unchanged one,
-         and this run does not follow right after a previous run,
-         and there are no lines deleted from the other file here,
-         then classify the first changed line as unchanged
-         and the following line as changed in its place.  */
+                       and this run does not follow right after a previous run,
+                       and there are no lines deleted from the other file here,
+                       then classify the first changed line as unchanged
+                       and the following line as changed in its place.  */
 
                     /* You might ask, how could this run follow right after another?
-         Only because the previous run was shifted here.  */
+                       Only because the previous run was shifted here.  */
 
                     if (end != i_end
@@ -929 +921 @@
                         ++i;
                         /* Since one line-that-matches is now before this run
-             instead of after, we must advance in the other file
-             to keep in synch.  */
+                           instead of after, we must advance in the other file
+                           to keep in synch.  */
                         ++j;
                     } else {
@@ -965 +957 @@
            The results of comparison are stored here.  */
         boolean[]       changed_flag;
-
     }
 }

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -181 +181 @@
 
         for (int pos = 0; pos < ways.size(); pos ++) {
-            if (changedWays[pos] == false) {
+            if (!changedWays[pos]) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -412 +412 @@
                                     try {
                                         return new ImageResource(ImageIO.read(new ByteArrayInputStream(bytes)));
-                                    } catch (IOException e) {}
+                                    } catch (IOException e) {
+                                        Main.warn("IOException while reading image: "+e.getMessage());
+                                    }
                                 }
                     }
@@ -522 +524 @@
                 try {
                     img = ImageIO.read(is.getFile().toURI().toURL());
-                } catch (IOException e) {}
+                } catch (IOException e) {
+                    Main.warn("IOException while reading HTTP image: "+e.getMessage());
+                }
                 return img == null ? null : new ImageResource(img);
             default:

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -34 +34 @@
     
     public static class TextAnalyzer {
-        int start = 0;
-        boolean keyFound = false;
         boolean quotesStarted = false;
         boolean esc = false;
@@ -42 +40 @@
         String data;
         int n;
-        boolean notFound;
 
         public TextAnalyzer(String text) {