Changeset 32705 in osm for applications/editors
- Timestamp:
- 2016-07-23T23:51:48+02:00 (8 years ago)
- Location:
- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/DetermineSdsModificationsUploadHook.java
r32703 r32705 134 134 } 135 135 break; 136 default: throw new AssertionError("unexpected case: " + old.getType()); 136 137 } 137 138 } -
applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsApi.java
r32703 r32705 17 17 import java.net.URL; 18 18 import java.net.UnknownHostException; 19 import java.nio.charset.StandardCharsets; 19 20 import java.util.HashMap; 20 21 import java.util.List; … … 399 400 // Unauthorized, see #3887. 400 401 // 401 BufferedReader in = new BufferedReader(new InputStreamReader(i ));402 BufferedReader in = new BufferedReader(new InputStreamReader(i, StandardCharsets.UTF_8)); 402 403 String s; 403 404 while ((s = in.readLine()) != null) { … … 496 497 InputStream i = FixEncoding(activeConnection.getErrorStream(), encoding); 497 498 if (i != null) { 498 BufferedReader in = new BufferedReader(new InputStreamReader(i ));499 BufferedReader in = new BufferedReader(new InputStreamReader(i, StandardCharsets.UTF_8)); 499 500 String s; 500 501 while ((s = in.readLine()) != null) { -
applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java
r32703 r32705 82 82 } 83 83 84 private class SdsAboutAction extends JosmAction {84 private static class SdsAboutAction extends JosmAction { 85 85 86 86 SdsAboutAction() { … … 123 123 } 124 124 125 private final class SdsPreferencesAction extends JosmAction implements Runnable {125 private static final class SdsPreferencesAction extends JosmAction implements Runnable { 126 126 127 127 private SdsPreferencesAction() { -
applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsPluginPreferences.java
r32703 r32705 83 83 Main.pref.put(SDS_PASSWORD, new String(password.getPassword())); 84 84 try { 85 api.requestShadowsFromSds(Collections.singletonList( new Long(1)), null, null, null);85 api.requestShadowsFromSds(Collections.singletonList(Long.valueOf(1L)), null, null, null); 86 86 JOptionPane.showMessageDialog( 87 87 Main.parent, -
applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java
r32703 r32705 51 51 }; 52 52 53 class QueueItem {53 static class QueueItem { 54 54 public IPrimitive primitive; 55 55 public HashMap<String, String> tags; … … 97 97 case WAY: return originalWays.get(other.getId()); 98 98 case RELATION: return originalRelations.get(other.getId()); 99 default: throw new AssertionError("unexpected case: " + other.getType()); 99 100 } 100 return null;101 101 } 102 102
Note:
See TracChangeset
for help on using the changeset viewer.