Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
- Timestamp:
- 2012-06-24T19:14:38+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r5275 r5297 78 78 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; 79 79 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 80 import org.openstreetmap.josm.gui.util.GuiHelper; 80 81 import org.openstreetmap.josm.tools.DateUtils; 81 82 import org.openstreetmap.josm.tools.FilteredCollection; … … 386 387 ); 387 388 388 StringBuffer sb = new StringBuffer();389 final StringBuffer sb = new StringBuffer(); 389 390 sb.append("<html>").append(msg1).append("</html>"); 390 391 if (numNewConflicts > 0) { 391 ButtonSpec[] options = new ButtonSpec[] {392 final ButtonSpec[] options = new ButtonSpec[] { 392 393 new ButtonSpec( 393 394 tr("OK"), … … 397 398 ) 398 399 }; 399 HelpAwareOptionPane.showOptionDialog( 400 Main.parent, 401 sb.toString(), 402 tr("Conflicts detected"), 403 JOptionPane.WARNING_MESSAGE, 404 null, /* no icon */ 405 options, 406 options[0], 407 ht("/Concepts/Conflict#WarningAboutDetectedConflicts") 408 ); 409 Main.map.conflictDialog.unfurlDialog(); 410 Main.map.repaint(); 400 GuiHelper.runInEDT(new Runnable() { 401 @Override 402 public void run() { 403 HelpAwareOptionPane.showOptionDialog( 404 Main.parent, 405 sb.toString(), 406 tr("Conflicts detected"), 407 JOptionPane.WARNING_MESSAGE, 408 null, /* no icon */ 409 options, 410 options[0], 411 ht("/Concepts/Conflict#WarningAboutDetectedConflicts") 412 ); 413 Main.map.conflictDialog.unfurlDialog(); 414 Main.map.repaint(); 415 } 416 }); 411 417 } 412 418 }
Note:
See TracChangeset
for help on using the changeset viewer.