Changeset 1847 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2009-07-25T23:44:19+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict/properties
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java
r1811 r1847 27 27 import org.openstreetmap.josm.data.osm.RelationMember; 28 28 import org.openstreetmap.josm.data.osm.Way; 29 import org.openstreetmap.josm.gui.OptionPaneUtil; 29 30 import org.openstreetmap.josm.gui.conflict.MergeDecisionType; 30 31 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; … … 417 418 String msg = e.getMessage() != null ? e.getMessage() : e.toString(); 418 419 msg = msg.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">"); 419 JOptionPane.showMessageDialog(420 OptionPaneUtil.showMessageDialog( 420 421 Main.parent, 421 422 tr("<html>An error occurred while communicating with the server<br>" … … 468 469 tr("No, cancel operation") 469 470 }; 470 int ret = JOptionPane.showOptionDialog(471 int ret = OptionPaneUtil.showOptionDialog( 471 472 Main.parent, 472 473 tr("<html>There are {0} additional nodes used by way {1}<br>" … … 478 479 JOptionPane.YES_NO_OPTION, 479 480 JOptionPane.QUESTION_MESSAGE, 480 null,481 481 options, 482 482 options[0] … … 497 497 tr("No, cancel operation") 498 498 }; 499 int ret = JOptionPane.showOptionDialog(499 int ret = OptionPaneUtil.showOptionDialog( 500 500 Main.parent, 501 501 tr("<html>There are {0} additional primitives referred to by relation {1}<br>" … … 507 507 JOptionPane.YES_NO_OPTION, 508 508 JOptionPane.QUESTION_MESSAGE, 509 null,510 509 options, 511 510 options[0] -
trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java
r1690 r1847 25 25 import org.openstreetmap.josm.data.coor.LatLon; 26 26 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 27 import org.openstreetmap.josm.gui.OptionPaneUtil; 27 28 import org.openstreetmap.josm.gui.conflict.MergeDecisionType; 28 29 import org.openstreetmap.josm.tools.ImageProvider; … … 582 583 tr("No, abort") 583 584 }; 584 int ret = JOptionPane.showOptionDialog(585 int ret = OptionPaneUtil.showOptionDialog( 585 586 null, 586 587 tr("<html>To keep your local version, JOSM<br>" … … 595 596 JOptionPane.YES_NO_OPTION, 596 597 JOptionPane.QUESTION_MESSAGE, 597 null,598 598 options, 599 599 options[1] … … 624 624 tr("No, abort") 625 625 }; 626 int ret = JOptionPane.showOptionDialog(626 int ret = OptionPaneUtil.showOptionDialog( 627 627 null, 628 628 tr("<html>JOSM will have to remove your local primitive with id {0}<br>" … … 634 634 JOptionPane.YES_NO_OPTION, 635 635 JOptionPane.QUESTION_MESSAGE, 636 null,637 636 options, 638 637 options[1]
Note:
See TracChangeset
for help on using the changeset viewer.