Changeset 9168 in josm for trunk/src/org/openstreetmap/josm/gui/help
- Timestamp:
- 2015-12-26T23:41:52+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
r8513 r9168 4 4 import java.io.BufferedReader; 5 5 import java.io.IOException; 6 import java.io.InputStreamReader;7 import java.net.HttpURLConnection;8 6 import java.net.MalformedURLException; 9 7 import java.net.URL; 10 import java.nio.charset.StandardCharsets;11 8 12 import org.openstreetmap.josm.Main; 13 import org.openstreetmap.josm.tools.Utils; 9 import org.openstreetmap.josm.tools.HttpClient; 14 10 import org.openstreetmap.josm.tools.WikiReader; 15 11 … … 46 42 if (helpTopicUrl == null) 47 43 throw new MissingHelpContentException("helpTopicUrl is null"); 48 Http URLConnectioncon = null;44 HttpClient.Response con = null; 49 45 try { 50 46 URL u = new URL(helpTopicUrl); 51 con = Utils.openHttpConnection(u); 52 con.connect(); 53 try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))) { 47 con = HttpClient.create(u).connect(); 48 try (BufferedReader in = con.getContentReader()) { 54 49 return prepareHelpContent(in, dotest, u); 55 50 } … … 59 54 HelpContentReaderException ex = new HelpContentReaderException(e); 60 55 if (con != null) { 61 try { 62 ex.setResponseCode(con.getResponseCode()); 63 } catch (IOException e1) { 64 // ignore 65 if (Main.isTraceEnabled()) { 66 Main.trace(e1.getMessage()); 67 } 68 } 56 ex.setResponseCode(con.getResponseCode()); 69 57 } 70 58 throw ex;
Note:
See TracChangeset
for help on using the changeset viewer.