Changeset 8375 in josm

Timestamp:

2015-05-17T03:06:35+02:00 (9 years ago)

Author:

Don-vip

Message:

code style - Method stores return result in local before immediately returning it

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/QuadBuckets.java (modified) (3 diffs)
• gui/conflict/pair/ListMergeModel.java (modified) (1 diff)
• gui/io/UploadStrategySelectionPanel.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/TextTagParser.java (modified) (1 diff)
• tools/XmlParsingException.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

@@ -171 +171 @@
 
         boolean __add_content(T o) {
-            boolean ret = false;
             // The split_lock will keep two concurrent calls from overwriting content
             if (content == null) {
                 content = new ArrayList<>();
             }
-            ret = content.add(o);
-            return ret;
+            return content.add(o);
         }
 
@@ -229 +227 @@
             QBLevel<T> next = this;
             QBLevel<T> sibling = next.next_sibling();
-            // Walk back up the tree to find the
-            // next sibling node.  It may be either
-            // a leaf or branch.
+            // Walk back up the tree to find the next sibling node.
+            // It may be either a leaf or branch.
             while (sibling == null) {
                 next = next.parent;
@@ -239 +236 @@
                 sibling = next.next_sibling();
             }
-            next = sibling;
-            return next;
+            return sibling;
         }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -595 +595 @@
         public int getRowCount() {
             int count = Math.max(getMyEntries().size(), getMergedEntries().size());
-            count = Math.max(count, getTheirEntries().size());
-            return count;
+            return Math.max(count, getTheirEntries().size());
         }
 

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -286 +286 @@
 
     protected int getChunkSize() {
-        int chunkSize;
         try {
-            chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
-            return chunkSize;
+            return Integer.parseInt(tfChunkSize.getText().trim());
         } catch(NumberFormatException e) {
             return UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE;

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

@@ -74 +74 @@
             time_left_str += "0";
         }
-        time_left_str += Integer.toString(seconds_left);
-        return time_left_str;
+        return time_left_str + Integer.toString(seconds_left);
     }
 

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

@@ -152 +152 @@
             result += "</font>";
         }
-        result += "&nbsp;</html>";
-        return result;
+        return result + "&nbsp;</html>";
     }
 

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

@@ -227 +227 @@
         // Free format
         // a 1 "b" 2 c=3 d 4 e "5"
-        TextAnalyzer parser = new TextAnalyzer(buf);
-        tags = parser.getFreeParsedTags();
-        return tags;
+        return new TextAnalyzer(buf).getFreeParsedTags();
     }
 

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

@@ -61 +61 @@
             msg = getClass().getName();
         }
-        msg = msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber);
-        return msg;
+        return msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber);
     }