Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
- Timestamp:
- 2009-08-30T19:07:24+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r1990 r2017 66 66 import org.openstreetmap.josm.gui.DefaultNameFormatter; 67 67 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 68 import org.openstreetmap.josm.gui.OptionPaneUtil;69 68 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 70 69 import org.openstreetmap.josm.gui.SideButton; … … 683 682 ); 684 683 switch(ret) { 685 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return;686 case JOptionPane.CLOSED_OPTION: return;687 case JOptionPane.NO_OPTION: return;688 case JOptionPane.YES_OPTION:689 memberTableModel.removeMembersReferringTo(toCheck);690 break;684 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return; 685 case JOptionPane.CLOSED_OPTION: return; 686 case JOptionPane.NO_OPTION: return; 687 case JOptionPane.YES_OPTION: 688 memberTableModel.removeMembersReferringTo(toCheck); 689 break; 691 690 } 692 691 } … … 719 718 ); 720 719 switch(ret) { 721 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;722 case JOptionPane.YES_OPTION: return true;723 case JOptionPane.NO_OPTION: return false;724 case JOptionPane.CLOSED_OPTION: return false;725 case JOptionPane.CANCEL_OPTION: throw new AddAbortException();720 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true; 721 case JOptionPane.YES_OPTION: return true; 722 case JOptionPane.NO_OPTION: return false; 723 case JOptionPane.CLOSED_OPTION: return false; 724 case JOptionPane.CANCEL_OPTION: throw new AddAbortException(); 726 725 } 727 726 // should not happen … … 736 735 primitive.getDisplayName(DefaultNameFormatter.getInstance()) 737 736 ); 738 OptionPaneUtil.showMessageDialog(737 JOptionPane.showMessageDialog( 739 738 Main.parent, 740 739 msg, … … 1141 1140 tr("No, continue editing") 1142 1141 }; 1143 int ret = OptionPaneUtil.showOptionDialog(1142 int ret = JOptionPane.showOptionDialog( 1144 1143 Main.parent, 1145 1144 tr("<html>This relation has been changed outside of the editor.<br>" … … 1150 1149 JOptionPane.YES_NO_OPTION, 1151 1150 JOptionPane.WARNING_MESSAGE, 1151 null, 1152 1152 options, 1153 1153 options[0] 1154 1154 ); 1155 1155 switch(ret) { 1156 case JOptionPane.CANCEL_OPTION: return false;1157 case JOptionPane.YES_OPTION: return true;1158 case JOptionPane.NO_OPTION: return false;1156 case JOptionPane.CANCEL_OPTION: return false; 1157 case JOptionPane.YES_OPTION: return true; 1158 case JOptionPane.NO_OPTION: return false; 1159 1159 } 1160 1160 return false; … … 1162 1162 1163 1163 protected void warnDoubleConflict() { 1164 OptionPaneUtil.showMessageDialog(1164 JOptionPane.showMessageDialog( 1165 1165 Main.parent, 1166 1166 tr("<html>Layer ''{0}'' already has a conflict for primitive<br>" … … 1395 1395 ); 1396 1396 switch(ret) { 1397 case JOptionPane.YES_OPTION: return true;1398 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true;1399 default:1400 return false;1397 case JOptionPane.YES_OPTION: return true; 1398 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true; 1399 default: 1400 return false; 1401 1401 } 1402 1402 } … … 1546 1546 1547 1547 if (conflictsCount > 0) { 1548 OptionPaneUtil.showMessageDialog(1548 JOptionPane.showMessageDialog( 1549 1549 Main.parent, 1550 1550 tr("There were {0} conflicts during import.", conflictsCount),
Note:
See TracChangeset
for help on using the changeset viewer.