Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol
- Timestamp:
- 2017-08-22T22:26:32+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io/remotecontrol
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
r11620 r12620 10 10 11 11 import org.openstreetmap.josm.Main; 12 import org.openstreetmap.josm.tools.Logging; 12 13 13 14 /** … … 37 38 instance4.start(); 38 39 } catch (IOException ex) { 39 Main.debug(ex);40 Main.warn(marktr("Cannot start IPv4 remotecontrol server on port {0}: {1}"),40 Logging.debug(ex); 41 Logging.warn(marktr("Cannot start IPv4 remotecontrol server on port {0}: {1}"), 41 42 Integer.toString(port), ex.getLocalizedMessage()); 42 43 } … … 47 48 /* only show error when we also have no IPv4 */ 48 49 if (instance4 == null) { 49 Main.debug(ex);50 Main.warn(marktr("Cannot start IPv6 remotecontrol server on port {0}: {1}"),50 Logging.debug(ex); 51 Logging.warn(marktr("Cannot start IPv6 remotecontrol server on port {0}: {1}"), 51 52 Integer.toString(port), ex.getLocalizedMessage()); 52 53 } … … 63 64 instance4.stopServer(); 64 65 } catch (IOException ioe) { 65 Main.error(ioe);66 Logging.error(ioe); 66 67 } 67 68 instance4 = null; … … 71 72 instance6.stopServer(); 72 73 } catch (IOException ioe) { 73 Main.error(ioe);74 Logging.error(ioe); 74 75 } 75 76 instance6 = null; … … 96 97 @Override 97 98 public void run() { 98 Main.info(marktr("RemoteControl::Accepting remote connections on {0}:{1}"),99 Logging.info(marktr("RemoteControl::Accepting remote connections on {0}:{1}"), 99 100 server.getInetAddress(), Integer.toString(server.getLocalPort())); 100 101 while (true) { … … 105 106 } catch (SocketException e) { 106 107 if (!server.isClosed()) { 107 Main.error(e);108 Logging.error(e); 108 109 } else { 109 110 // stop the thread automatically if server is stopped … … 111 112 } 112 113 } catch (IOException ioe) { 113 Main.error(ioe);114 Logging.error(ioe); 114 115 } 115 116 } … … 122 123 */ 123 124 public void stopServer() throws IOException { 124 Main.info(marktr("RemoteControl::Server {0}:{1} stopped."),125 Logging.info(marktr("RemoteControl::Server {0}:{1} stopped."), 125 126 server.getInetAddress(), Integer.toString(server.getLocalPort())); 126 127 server.close(); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
r12458 r12620 41 41 import org.openstreetmap.josm.Main; 42 42 import org.openstreetmap.josm.data.preferences.StringProperty; 43 import org.openstreetmap.josm.tools.Logging; 43 44 44 45 import sun.security.util.ObjectIdentifier; … … 208 209 209 210 if (!path.toFile().exists()) { 210 Main.debug("No keystore found, creating a new one");211 Logging.debug("No keystore found, creating a new one"); 211 212 212 213 // Create new keystore like previous one generated with JDK keytool as follows: … … 252 253 ks.load(in, KEYSTORE_PASSWORD.get().toCharArray()); 253 254 254 if ( Main.isDebugEnabled()) {255 if (Logging.isDebugEnabled()) { 255 256 for (Enumeration<String> aliases = ks.aliases(); aliases.hasMoreElements();) { 256 Main.debug("Alias in JOSM keystore: "+aliases.nextElement());257 Logging.debug("Alias in JOSM keystore: {0}", aliases.nextElement()); 257 258 } 258 259 } … … 278 279 sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); 279 280 280 if ( Main.isTraceEnabled()) {281 Main.trace("SSL Context protocol: " +sslContext.getProtocol());282 Main.trace("SSL Context provider: " +sslContext.getProvider());281 if (Logging.isTraceEnabled()) { 282 Logging.trace("SSL Context protocol: {0}", sslContext.getProtocol()); 283 Logging.trace("SSL Context provider: {0}", sslContext.getProvider()); 283 284 } 284 285 … … 316 317 instance4.start(); 317 318 } catch (IOException | GeneralSecurityException ex) { 318 Main.debug(ex);319 Main.warn(marktr("Cannot start IPv4 remotecontrol https server on port {0}: {1}"),319 Logging.debug(ex); 320 Logging.warn(marktr("Cannot start IPv4 remotecontrol https server on port {0}: {1}"), 320 321 Integer.toString(port), ex.getLocalizedMessage()); 321 322 } … … 326 327 /* only show error when we also have no IPv4 */ 327 328 if (instance4 == null) { 328 Main.debug(ex);329 Main.warn(marktr("Cannot start IPv6 remotecontrol https server on port {0}: {1}"),329 Logging.debug(ex); 330 Logging.warn(marktr("Cannot start IPv6 remotecontrol https server on port {0}: {1}"), 330 331 Integer.toString(port), ex.getLocalizedMessage()); 331 332 } … … 342 343 instance4.stopServer(); 343 344 } catch (IOException ioe) { 344 Main.error(ioe);345 Logging.error(ioe); 345 346 } 346 347 instance4 = null; … … 350 351 instance6.stopServer(); 351 352 } catch (IOException ioe) { 352 Main.error(ioe);353 Logging.error(ioe); 353 354 } 354 355 instance6 = null; … … 372 373 // Create SSL Server factory 373 374 SSLServerSocketFactory factory = sslContext.getServerSocketFactory(); 374 if ( Main.isTraceEnabled()) {375 Main.trace("SSL factory - Supported Cipher suites: "+Arrays.toString(factory.getSupportedCipherSuites()));375 if (Logging.isTraceEnabled()) { 376 Logging.trace("SSL factory - Supported Cipher suites: {0}", Arrays.toString(factory.getSupportedCipherSuites())); 376 377 } 377 378 … … 379 380 RemoteControl.getInet6Address() : RemoteControl.getInet4Address()); 380 381 381 if ( Main.isTraceEnabled() && server instanceof SSLServerSocket) {382 if (Logging.isTraceEnabled() && server instanceof SSLServerSocket) { 382 383 SSLServerSocket sslServer = (SSLServerSocket) server; 383 Main.trace("SSL server - Enabled Cipher suites: "+Arrays.toString(sslServer.getEnabledCipherSuites()));384 Main.trace("SSL server - Enabled Protocols: "+Arrays.toString(sslServer.getEnabledProtocols()));385 Main.trace("SSL server - Enable Session Creation: "+sslServer.getEnableSessionCreation());386 Main.trace("SSL server - Need Client Auth: "+sslServer.getNeedClientAuth());387 Main.trace("SSL server - Want Client Auth: "+sslServer.getWantClientAuth());388 Main.trace("SSL server - Use Client Mode: "+sslServer.getUseClientMode());384 Logging.trace("SSL server - Enabled Cipher suites: {0}", Arrays.toString(sslServer.getEnabledCipherSuites())); 385 Logging.trace("SSL server - Enabled Protocols: {0}", Arrays.toString(sslServer.getEnabledProtocols())); 386 Logging.trace("SSL server - Enable Session Creation: {0}", sslServer.getEnableSessionCreation()); 387 Logging.trace("SSL server - Need Client Auth: {0}", sslServer.getNeedClientAuth()); 388 Logging.trace("SSL server - Want Client Auth: {0}", sslServer.getWantClientAuth()); 389 Logging.trace("SSL server - Use Client Mode: {0}", sslServer.getUseClientMode()); 389 390 } 390 391 } … … 395 396 @Override 396 397 public void run() { 397 Main.info(marktr("RemoteControl::Accepting secure remote connections on {0}:{1}"),398 Logging.info(marktr("RemoteControl::Accepting secure remote connections on {0}:{1}"), 398 399 server.getInetAddress(), Integer.toString(server.getLocalPort())); 399 400 while (true) { … … 401 402 @SuppressWarnings("resource") 402 403 Socket request = server.accept(); 403 if ( Main.isTraceEnabled() && request instanceof SSLSocket) {404 if (Logging.isTraceEnabled() && request instanceof SSLSocket) { 404 405 SSLSocket sslSocket = (SSLSocket) request; 405 Main.trace("SSL socket - Enabled Cipher suites: "+Arrays.toString(sslSocket.getEnabledCipherSuites()));406 Main.trace("SSL socket - Enabled Protocols: "+Arrays.toString(sslSocket.getEnabledProtocols()));407 Main.trace("SSL socket - Enable Session Creation: "+sslSocket.getEnableSessionCreation());408 Main.trace("SSL socket - Need Client Auth: "+sslSocket.getNeedClientAuth());409 Main.trace("SSL socket - Want Client Auth: "+sslSocket.getWantClientAuth());410 Main.trace("SSL socket - Use Client Mode: "+sslSocket.getUseClientMode());411 Main.trace("SSL socket - Session: "+sslSocket.getSession());406 Logging.trace("SSL socket - Enabled Cipher suites: {0}", Arrays.toString(sslSocket.getEnabledCipherSuites())); 407 Logging.trace("SSL socket - Enabled Protocols: {0}", Arrays.toString(sslSocket.getEnabledProtocols())); 408 Logging.trace("SSL socket - Enable Session Creation: {0}", sslSocket.getEnableSessionCreation()); 409 Logging.trace("SSL socket - Need Client Auth: {0}", sslSocket.getNeedClientAuth()); 410 Logging.trace("SSL socket - Want Client Auth: {0}", sslSocket.getWantClientAuth()); 411 Logging.trace("SSL socket - Use Client Mode: {0}", sslSocket.getUseClientMode()); 412 Logging.trace("SSL socket - Session: {0}", sslSocket.getSession()); 412 413 } 413 414 RequestProcessor.processRequest(request); 414 415 } catch (SocketException e) { 415 416 if (!server.isClosed()) { 416 Main.error(e);417 Logging.error(e); 417 418 } 418 419 } catch (IOException ioe) { 419 Main.error(ioe);420 Logging.error(ioe); 420 421 } 421 422 } … … 428 429 */ 429 430 public void stopServer() throws IOException { 430 Main.info(marktr("RemoteControl::Server {0}:{1} stopped."),431 Logging.info(marktr("RemoteControl::Server {0}:{1} stopped."), 431 432 server.getInetAddress(), Integer.toString(server.getLocalPort())); 432 433 server.close(); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
r11952 r12620 25 25 import java.util.regex.Pattern; 26 26 27 import org.openstreetmap.josm.Main;28 27 import org.openstreetmap.josm.gui.help.HelpUtil; 29 28 import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler; … … 41 40 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerForbiddenException; 42 41 import org.openstreetmap.josm.io.remotecontrol.handler.VersionHandler; 42 import org.openstreetmap.josm.tools.Logging; 43 43 import org.openstreetmap.josm.tools.Utils; 44 44 … … 119 119 String commandWithSlash = '/' + command; 120 120 if (handlers.get(commandWithSlash) != null) { 121 Main.info("RemoteControl: ignoring duplicate command " + command121 Logging.info("RemoteControl: ignoring duplicate command " + command 122 122 + " with handler " + handler.getName()); 123 123 } else { 124 124 if (!silent) { 125 Main.info("RemoteControl: adding command \"" +125 Logging.info("RemoteControl: adding command \"" + 126 126 command + "\" (handled by " + handler.getSimpleName() + ')'); 127 127 } … … 161 161 return; 162 162 } 163 Main.info("RemoteControl received: " + get);163 Logging.info("RemoteControl received: " + get); 164 164 165 165 StringTokenizer st = new StringTokenizer(get); … … 247 247 out.flush(); 248 248 } catch (RequestHandlerErrorException ex) { 249 Main.debug(ex);249 Logging.debug(ex); 250 250 sendError(out); 251 251 } catch (RequestHandlerBadRequestException ex) { 252 Main.debug(ex);252 Logging.debug(ex); 253 253 sendBadRequest(out, ex.getMessage()); 254 254 } catch (RequestHandlerForbiddenException ex) { 255 Main.debug(ex);255 Logging.debug(ex); 256 256 sendForbidden(out, ex.getMessage()); 257 257 } … … 259 259 260 260 } catch (IOException ioe) { 261 Main.debug(Main.getErrorMessage(ioe));261 Logging.debug(Logging.getErrorMessage(ioe)); 262 262 } catch (ReflectiveOperationException e) { 263 Main.error(e);263 Logging.error(e); 264 264 try { 265 265 sendError(out); 266 266 } catch (IOException e1) { 267 Main.warn(e1);267 Logging.warn(e1); 268 268 } 269 269 } finally { … … 271 271 request.close(); 272 272 } catch (IOException e) { 273 Main.debug(Main.getErrorMessage(e));273 Logging.debug(Logging.getErrorMessage(e)); 274 274 } 275 275 } … … 402 402 handler = handlers.get(cmd).getConstructor().newInstance(); 403 403 } catch (ReflectiveOperationException ex) { 404 Main.error(ex);404 Logging.error(ex); 405 405 return null; 406 406 } … … 410 410 return w.toString(); 411 411 } catch (IOException e) { 412 Main.error(e);412 Logging.error(e); 413 413 return null; 414 414 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
r10716 r12620 17 17 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog; 18 18 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 19 import org.openstreetmap.josm.tools.Logging; 19 20 20 21 /** … … 77 78 78 79 // Parse the arguments 79 Main.info("Adding node at (" + lat + ", " + lon + ')');80 Logging.info("Adding node at (" + lat + ", " + lon + ')'); 80 81 81 82 // Create a new node -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/FeaturesHandler.java
r11567 r12620 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import org.openstreetmap.josm.Main;7 6 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 8 7 import org.openstreetmap.josm.io.remotecontrol.RequestProcessor; 8 import org.openstreetmap.josm.tools.Logging; 9 9 10 10 /** … … 37 37 buf.append(info); 38 38 } else { 39 Main.warn("Unknown handler {0} passed to /features request", s);39 Logging.warn("Unknown handler {0} passed to /features request", s); 40 40 } 41 41 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
r10728 r12620 13 13 import org.openstreetmap.josm.gui.util.GuiHelper; 14 14 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 15 import org.openstreetmap.josm.tools.Logging; 15 16 import org.openstreetmap.josm.tools.Utils; 16 17 … … 77 78 imgInfo.setDefaultMinZoom(Integer.parseInt(minZoom)); 78 79 } catch (NumberFormatException e) { 79 Main.error(e);80 Logging.error(e); 80 81 } 81 82 } … … 85 86 imgInfo.setDefaultMaxZoom(Integer.parseInt(maxZoom)); 86 87 } catch (NumberFormatException e) { 87 Main.error(e);88 Logging.error(e); 88 89 } 89 90 } … … 97 98 for (ImageryLayer layer : Main.getLayerManager().getLayersOfType(ImageryLayer.class)) { 98 99 if (layer.getInfo().equals(imgInfo)) { 99 Main.info("Imagery layer already exists: "+imgInfo);100 Logging.info("Imagery layer already exists: "+imgInfo); 100 101 return; 101 102 } … … 106 107 Main.getLayerManager().addLayer(ImageryLayer.create(imgInfo)); 107 108 } catch (IllegalArgumentException e) { 108 Main.error(e, false);109 Logging.log(Logging.LEVEL_ERROR, e); 109 110 } 110 111 }); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
r11746 r12620 14 14 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask; 15 15 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 16 import org.openstreetmap.josm.tools.Logging; 16 17 import org.openstreetmap.josm.tools.Utils; 17 18 … … 36 37 // For compatibility reasons with older instances of JOSM, arbitrary choice of DownloadOsmTask 37 38 // As of 2015-04, Overpass Turbo requires this branch of code ... 38 Main.debug("Remote control, /import: defaulting to DownloadOsmTask");39 Logging.debug("Remote control, /import: defaulting to DownloadOsmTask"); 39 40 new DownloadOsmTask().loadUrl(isLoadInNewLayer(), url.toExternalForm(), null); 40 41 } else if (Main.pref.getBoolean("remotecontrol.import.interactive", true)) { … … 48 49 } 49 50 } catch (RuntimeException ex) { // NOPMD 50 Main.warn("RemoteControl: Error parsing import remote control request:");51 Main.error(ex);51 Logging.warn("RemoteControl: Error parsing import remote control request:"); 52 Logging.error(ex); 52 53 throw new RequestHandlerErrorException(ex); 53 54 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
r12472 r12620 29 29 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog; 30 30 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 31 import org.openstreetmap.josm.tools.Logging; 31 32 import org.openstreetmap.josm.tools.SubclassFilteredCollection; 32 33 import org.openstreetmap.josm.tools.Utils; … … 114 115 if (command.equals(myCommand)) { 115 116 if (!PermissionPrefWithDefault.LOAD_DATA.isAllowed()) { 116 Main.info("RemoteControl: download forbidden by preferences");117 Logging.info("RemoteControl: download forbidden by preferences"); 117 118 } else { 118 119 Area toDownload = null; … … 138 139 } 139 140 if (toDownload != null && toDownload.isEmpty()) { 140 Main.info("RemoteControl: no download necessary");141 Logging.info("RemoteControl: no download necessary"); 141 142 } else { 142 143 Future<?> future = osmTask.download(newLayer, new Bounds(minlat, minlon, maxlat, maxlon), … … 147 148 } 148 149 } catch (RuntimeException ex) { // NOPMD 149 Main.warn("RemoteControl: Error parsing load_and_zoom remote control request:");150 Main.error(ex);150 Logging.warn("RemoteControl: Error parsing load_and_zoom remote control request:"); 151 Logging.error(ex); 151 152 throw new RequestHandlerErrorException(ex); 152 153 } … … 200 201 }); 201 202 } catch (SearchCompiler.ParseError ex) { 202 Main.error(ex);203 Logging.error(ex); 203 204 throw new RequestHandlerErrorException(ex); 204 205 } … … 284 285 toSelect.add(SimplePrimitiveId.fromString(item)); 285 286 } catch (IllegalArgumentException ex) { 286 Main.warn(ex, "RemoteControl: invalid selection '" + item + "' ignored");287 Logging.log(Logging.LEVEL_WARN, "RemoteControl: invalid selection '" + item + "' ignored", ex); 287 288 } 288 289 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
r12472 r12620 18 18 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog; 19 19 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 20 import org.openstreetmap.josm.tools.Logging; 20 21 21 22 /** … … 59 60 protected void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException { 60 61 if (!PermissionPrefWithDefault.LOAD_DATA.isAllowed()) { 61 Main.info("RemoteControl: download forbidden by preferences");62 Logging.info("RemoteControl: download forbidden by preferences"); 62 63 } 63 64 if (!ps.isEmpty()) { … … 102 103 ps.add(SimplePrimitiveId.fromString(i)); 103 104 } catch (IllegalArgumentException e) { 104 Main.warn(e, "RemoteControl: invalid selection '"+i+"' ignored.");105 Logging.log(Logging.LEVEL_WARN, "RemoteControl: invalid selection '"+i+"' ignored.", e); 105 106 } 106 107 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
r11567 r12620 20 20 import org.openstreetmap.josm.Main; 21 21 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; 22 import org.openstreetmap.josm.tools.Logging; 22 23 import org.openstreetmap.josm.tools.Utils; 23 24 … … 148 149 if (permissionPref != null && permissionPref.pref != null && !Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) { 149 150 String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand); 150 Main.info(err);151 Logging.info(err); 151 152 throw new RequestHandlerForbiddenException(err); 152 153 } … … 228 229 if (value == null || value.isEmpty()) { 229 230 error = true; 230 Main.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter");231 Logging.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter"); 231 232 missingKeys.add(key); 232 233 } … … 241 242 for (String par: args.keySet()) { 242 243 if (!knownParams.contains(par)) { 243 Main.warn("Unknown remote control parameter {0}, skipping it", par);244 Logging.warn("Unknown remote control parameter {0}, skipping it", par); 244 245 } 245 246 }
Note:
See TracChangeset
for help on using the changeset viewer.