Changeset 10000 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2016-03-16T01:17:59+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java
r9997 r10000 106 106 } 107 107 if (certificateIsMissing(keyStore, cert)) { 108 Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName())); 108 if (Main.isDebugEnabled()) { 109 Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName())); 110 } 109 111 String alias = "josm:" + new File(CERT_AMEND[i]).getName(); 110 112 try { -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r9353 r10000 859 859 * @throws OsmTransferException if the API response cannot be parsed 860 860 */ 861 private Note parseSingleNote(String xml) throws OsmTransferException {861 private static Note parseSingleNote(String xml) throws OsmTransferException { 862 862 try { 863 863 List<Note> newNotes = new NoteReader(xml).parse(); … … 865 865 return newNotes.get(0); 866 866 } 867 // Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note867 // Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note 868 868 throw new OsmTransferException(tr("Note upload failed")); 869 869 } catch (SAXException | IOException e) { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
r9231 r10000 266 266 * If the error can not be written 267 267 */ 268 private void sendError(Writer out) throws IOException {268 private static void sendError(Writer out) throws IOException { 269 269 sendHeader(out, "500 Internal Server Error", "text/html", true); 270 270 out.write("<HTML>\r\n"); … … 285 285 * If the error can not be written 286 286 */ 287 private void sendNotImplemented(Writer out) throws IOException {287 private static void sendNotImplemented(Writer out) throws IOException { 288 288 sendHeader(out, "501 Not Implemented", "text/html", true); 289 289 out.write("<HTML>\r\n"); … … 306 306 * If the error can not be written 307 307 */ 308 private void sendForbidden(Writer out, String help) throws IOException {308 private static void sendForbidden(Writer out, String help) throws IOException { 309 309 sendHeader(out, "403 Forbidden", "text/html", true); 310 310 out.write("<HTML>\r\n"); … … 330 330 * If the error can not be written 331 331 */ 332 private void sendBadRequest(Writer out, String help) throws IOException {332 private static void sendBadRequest(Writer out, String help) throws IOException { 333 333 sendHeader(out, "400 Bad Request", "text/html", true); 334 334 out.write("<HTML>\r\n");
Note:
See TracChangeset
for help on using the changeset viewer.