Changeset 6524 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2013-12-24T21:12:40+01:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
r6380 r6524 8 8 import java.net.URL; 9 9 import java.net.URLEncoder; 10 import java.util.ArrayList; 10 11 import java.util.Collection; 11 12 import java.util.concurrent.Future; … … 29 30 import org.openstreetmap.josm.io.OsmTransferCanceledException; 30 31 import org.openstreetmap.josm.io.OsmTransferException; 32 import org.openstreetmap.josm.tools.Utils; 31 33 import org.xml.sax.SAXException; 32 34 … … 322 324 if (urlString.matches(PATTERN_OSM_API_URL)) { 323 325 // TODO: proper i18n after stabilization 324 String message = "<ul><li>"+tr("OSM Server URL:") + " " + url.getHost() + "</li><li>" + 325 tr("Command")+": "+url.getPath()+"</li>"; 326 Collection<String> items = new ArrayList<String>(); 327 items.add(tr("OSM Server URL:") + " " + url.getHost()); 328 items.add(tr("Command")+": "+url.getPath()); 326 329 if (url.getQuery() != null) { 327 message += "<li>" + tr("Request details: {0}", url.getQuery().replaceAll(",\\s*", ", ")) + "</li>"; 328 } 329 message += "</ul>"; 330 return message; 330 items.add(tr("Request details: {0}", url.getQuery().replaceAll(",\\s*", ", "))); 331 } 332 return Utils.joinAsHtmlUnorderedList(items); 331 333 } 332 334 // TODO: other APIs -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
r6336 r6524 34 34 import org.openstreetmap.josm.tools.ExceptionUtil; 35 35 import org.openstreetmap.josm.tools.ImageProvider; 36 import org.openstreetmap.josm.tools.Utils; 36 37 37 38 /** … … 257 258 } 258 259 if (!errors.isEmpty()) { 259 final StringBuilder sb = new StringBuilder();260 final Collection<String> items = new ArrayList<String>(); 260 261 for (Object error : errors) { 261 262 if (error instanceof String) { 262 sb.append("<li>").append(error).append("</li>").append("<br>");263 items.add((String) error); 263 264 } else if (error instanceof Exception) { 264 sb.append("<li>").append(ExceptionUtil.explainException((Exception) error)).append("</li>") 265 .append("<br>"); 265 items.add(ExceptionUtil.explainException((Exception) error)); 266 266 } 267 267 } 268 sb.insert(0, "<ul>");269 sb.append("</ul>");270 268 271 269 GuiHelper.runInEDT(new Runnable() { … … 273 271 public void run() { 274 272 JOptionPane.showMessageDialog(Main.parent, "<html>" 275 + tr("The following errors occurred during mass download: {0}", sb.toString()) + "</html>", 273 + tr("The following errors occurred during mass download: {0}", 274 Utils.joinAsHtmlUnorderedList(items)) + "</html>", 276 275 tr("Errors during download"), JOptionPane.ERROR_MESSAGE); 277 276 } -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java
r6084 r6524 5 5 6 6 import java.util.ArrayList; 7 import java.util.Collection; 7 8 import java.util.LinkedHashSet; 8 9 import java.util.List; … … 15 16 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 16 17 import org.openstreetmap.josm.tools.ExceptionUtil; 18 import org.openstreetmap.josm.tools.Utils; 17 19 18 20 public class PostDownloadHandler implements Runnable { … … 104 106 // 105 107 if (!errors.isEmpty()) { 106 final StringBuffer sb = new StringBuffer();108 final Collection<String> items = new ArrayList<String>(); 107 109 for (Object error:errors) { 108 110 if (error instanceof String) { 109 sb.append("<li>").append(error).append("</li>").append("<br>");111 items.add((String) error); 110 112 } else if (error instanceof Exception) { 111 sb.append("<li>").append(ExceptionUtil.explainException((Exception)error)).append("</li>").append("<br>");113 items.add(ExceptionUtil.explainException((Exception)error)); 112 114 } 113 115 } 114 sb.insert(0, "<html><ul>");115 sb.append("</ul></html>");116 116 117 117 SwingUtilities.invokeLater(new Runnable() { … … 120 120 JOptionPane.showMessageDialog( 121 121 Main.parent, 122 sb.toString(),122 "<html>"+Utils.joinAsHtmlUnorderedList(items)+"</html>", 123 123 tr("Errors during download"), 124 124 JOptionPane.ERROR_MESSAGE); -
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r6429 r6524 189 189 label.setToolTipText("<html>" 190 190 + description 191 + (examples.length > 0 ? ("<ul><li>" + Utils.join("</li><li>", Arrays.asList(examples)) + "</li></ul>") : "")191 + (examples.length > 0 ? Utils.joinAsHtmlUnorderedList(Arrays.asList(examples)) : "") 192 192 + "</html>"); 193 193 }
Note:
See TracChangeset
for help on using the changeset viewer.