Changeset 5839 in josm for trunk/src/org
- Timestamp:
- 2013-04-11T19:41:05+02:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/Version.java
r5819 r5839 40 40 in = new BufferedReader(new InputStreamReader(resource.openStream(), "UTF-8")); 41 41 StringBuffer sb = new StringBuffer(); 42 for (String line = in.readLine(); line != null; line = in.readLine()) { 43 sb.append(line).append("\n"); 42 try { 43 for (String line = in.readLine(); line != null; line = in.readLine()) { 44 sb.append(line).append("\n"); 45 } 46 } finally { 47 in.close(); 44 48 } 45 49 s = sb.toString(); -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r5792 r5839 323 323 UTFInputStreamReader in = UTFInputStreamReader.create(u.openStream(), "utf-8"); 324 324 String r = new Scanner(in).useDelimiter("\\A").next(); 325 in.close(); 325 326 System.out.println("Successfully loaded Bing attribution data."); 326 327 return r.getBytes("utf-8"); -
trunk/src/org/openstreetmap/josm/tools/I18n.java
r5266 r5839 469 469 return false; 470 470 } 471 try 472 { 473 if(load(en.openStream(), tr.openStream(), false)) 474 { 471 InputStream enStream = null; 472 InputStream trStream = null; 473 try { 474 enStream = en.openStream(); 475 trStream = tr.openStream(); 476 if (load(enStream, trStream, false)) { 475 477 pluralMode = languages.get(l); 476 478 loadedCode = l; 477 479 return true; 478 480 } 479 } 480 catch(IOException e) 481 { 481 } catch(IOException e) { 482 // Ignore exception 483 } finally { 484 if (trStream != null) try {trStream.close();} catch(IOException e) {} 485 if (enStream != null) try {enStream.close();} catch(IOException e) {} 482 486 } 483 487 return false;
Note:
See TracChangeset
for help on using the changeset viewer.