Changeset 8375 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2015-05-17T03:06:35+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
r8346 r8375 171 171 172 172 boolean __add_content(T o) { 173 boolean ret = false;174 173 // The split_lock will keep two concurrent calls from overwriting content 175 174 if (content == null) { 176 175 content = new ArrayList<>(); 177 176 } 178 ret = content.add(o); 179 return ret; 177 return content.add(o); 180 178 } 181 179 … … 229 227 QBLevel<T> next = this; 230 228 QBLevel<T> sibling = next.next_sibling(); 231 // Walk back up the tree to find the 232 // next sibling node. It may be either 233 // a leaf or branch. 229 // Walk back up the tree to find the next sibling node. 230 // It may be either a leaf or branch. 234 231 while (sibling == null) { 235 232 next = next.parent; … … 239 236 sibling = next.next_sibling(); 240 237 } 241 next = sibling; 242 return next; 238 return sibling; 243 239 } 244 240 -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r8338 r8375 595 595 public int getRowCount() { 596 596 int count = Math.max(getMyEntries().size(), getMergedEntries().size()); 597 count = Math.max(count, getTheirEntries().size()); 598 return count; 597 return Math.max(count, getTheirEntries().size()); 599 598 } 600 599 -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r8332 r8375 286 286 287 287 protected int getChunkSize() { 288 int chunkSize;289 288 try { 290 chunkSize = Integer.parseInt(tfChunkSize.getText().trim()); 291 return chunkSize; 289 return Integer.parseInt(tfChunkSize.getText().trim()); 292 290 } catch(NumberFormatException e) { 293 291 return UploadStrategySpecification.UNSPECIFIED_CHUNK_SIZE; -
trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
r8291 r8375 74 74 time_left_str += "0"; 75 75 } 76 time_left_str += Integer.toString(seconds_left); 77 return time_left_str; 76 return time_left_str + Integer.toString(seconds_left); 78 77 } 79 78 -
trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
r8129 r8375 152 152 result += "</font>"; 153 153 } 154 result += " </html>"; 155 return result; 154 return result + " </html>"; 156 155 } 157 156 -
trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
r8285 r8375 227 227 // Free format 228 228 // a 1 "b" 2 c=3 d 4 e "5" 229 TextAnalyzer parser = new TextAnalyzer(buf); 230 tags = parser.getFreeParsedTags(); 231 return tags; 229 return new TextAnalyzer(buf).getFreeParsedTags(); 232 230 } 233 231 -
trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java
r7937 r8375 61 61 msg = getClass().getName(); 62 62 } 63 msg = msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber); 64 return msg; 63 return msg + " " + tr("(at line {0}, column {1})", lineNumber, columnNumber); 65 64 } 66 65
Note:
See TracChangeset
for help on using the changeset viewer.