Changeset 5085 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
- Timestamp:
- 2012-03-14T23:33:27+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
r4834 r5085 13 13 import java.util.Arrays; 14 14 import java.util.Date; 15 import java.util.HashMap;16 15 import java.util.Map; 17 16 import java.util.Map.Entry; 18 17 import java.util.StringTokenizer; 19 18 import java.util.TreeMap; 20 import java.util.TreeSet;21 19 22 20 import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler; … … 26 24 import org.openstreetmap.josm.io.remotecontrol.handler.LoadAndZoomHandler; 27 25 import org.openstreetmap.josm.io.remotecontrol.handler.LoadObjectHandler; 26 import org.openstreetmap.josm.io.remotecontrol.handler.OpenFileHandler; 28 27 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler; 29 28 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException; … … 117 116 /** Add default request handlers */ 118 117 static { 119 addRequestHandlerClass(LoadAndZoomHandler.command, 120 LoadAndZoomHandler.class, true); 121 addRequestHandlerClass(LoadAndZoomHandler.command2, 122 LoadAndZoomHandler.class, true); 118 addRequestHandlerClass(LoadAndZoomHandler.command, LoadAndZoomHandler.class, true); 119 addRequestHandlerClass(LoadAndZoomHandler.command2, LoadAndZoomHandler.class, true); 123 120 addRequestHandlerClass(ImageryHandler.command, ImageryHandler.class, true); 124 121 addRequestHandlerClass(AddNodeHandler.command, AddNodeHandler.class, true); … … 127 124 addRequestHandlerClass(VersionHandler.command, VersionHandler.class, true); 128 125 addRequestHandlerClass(LoadObjectHandler.command, LoadObjectHandler.class, true); 126 addRequestHandlerClass(OpenFileHandler.command, OpenFileHandler.class, true); 129 127 } 130 128 … … 203 201 handler.setCommand(command); 204 202 handler.setUrl(url); 205 handler.checkPermission();206 203 handler.handle(); 207 204 sendHeader(out, "200 OK", handler.getContentType(), false); … … 216 213 sendBadRequest(out, ex.getMessage()); 217 214 } catch (RequestHandlerForbiddenException ex) { 218 sendForbidden(out );215 sendForbidden(out, ex.getMessage()); 219 216 } 220 217 } … … 281 278 * If the error can not be written 282 279 */ 283 private void sendForbidden(Writer out ) throws IOException {280 private void sendForbidden(Writer out, String help) throws IOException { 284 281 sendHeader(out, "403 Forbidden", "text/html", true); 285 282 out.write("<HTML>\r\n"); … … 288 285 out.write("<BODY>"); 289 286 out.write("<H1>HTTP Error 403: Forbidden</h2>\r\n"); 287 if (help != null) { 288 out.write(help); 289 } 290 290 out.write("</BODY></HTML>\r\n"); 291 291 out.flush();
Note:
See TracChangeset
for help on using the changeset viewer.