Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java
- Timestamp:
- 2009-08-02T14:36:40+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java
r1865 r1879 20 20 import java.util.StringTokenizer; 21 21 import java.util.Map.Entry; 22 import java.util.logging.Logger; 22 23 23 24 import javax.swing.JOptionPane; … … 37 38 */ 38 39 public class ServerSidePreferences extends Preferences { 40 static private final Logger logger = Logger.getLogger(ServerSidePreferences.class.getName()); 39 41 40 42 private final Connection connection; … … 181 183 182 184 @Override public Collection<Bookmark> loadBookmarks() { 185 URL url = null; 183 186 try { 184 187 Collection<Bookmark> bookmarks; 185 BufferedReader in = new BufferedReader(new InputStreamReader(new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks").openStream()));186 188 bookmarks = new LinkedList<Bookmark>(); 189 url = new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks"); 190 BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream())); 191 187 192 for (String line = in.readLine(); line != null; line = in.readLine()) { 188 193 StringTokenizer st = new StringTokenizer(line, ","); … … 209 214 } catch (IOException e) { 210 215 e.printStackTrace(); 216 } catch(SecurityException e) { 217 e.printStackTrace(); 218 logger.warning(tr("Failed to load bookmarks from ''{0}'' for security reasons. Exception was: {1}", url == null ? "null" : url.toExternalForm(), e.toString())); 211 219 } 212 220 return Collections.emptyList();
Note:
See TracChangeset
for help on using the changeset viewer.