Changeset 1987 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
- Timestamp:
- 2009-08-23T17:45:53+02:00 (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r1937 r1987 181 181 182 182 setSize(findMaxDialogSize()); 183 try {184 setAlwaysOnTop(true);185 } catch (SecurityException e) {186 logger.warning(tr("Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}", e187 .toString()));188 }189 183 190 184 addWindowListener( … … 689 683 ); 690 684 switch(ret) { 691 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return;692 case JOptionPane.CLOSED_OPTION: return;693 case JOptionPane.NO_OPTION: return;694 case JOptionPane.YES_OPTION:695 memberTableModel.removeMembersReferringTo(toCheck);696 break;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; 697 691 } 698 692 } … … 727 721 ); 728 722 switch(ret) { 729 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true;730 case JOptionPane.YES_OPTION: return true;731 case JOptionPane.NO_OPTION: return false;732 case JOptionPane.CLOSED_OPTION: return false;733 case JOptionPane.CANCEL_OPTION: throw new AddAbortException();723 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true; 724 case JOptionPane.YES_OPTION: return true; 725 case JOptionPane.NO_OPTION: return false; 726 case JOptionPane.CLOSED_OPTION: return false; 727 case JOptionPane.CANCEL_OPTION: throw new AddAbortException(); 734 728 } 735 729 // should not happen … … 1162 1156 ); 1163 1157 switch(ret) { 1164 case JOptionPane.CANCEL_OPTION: return false;1165 case JOptionPane.YES_OPTION: return true;1166 case JOptionPane.NO_OPTION: return false;1158 case JOptionPane.CANCEL_OPTION: return false; 1159 case JOptionPane.YES_OPTION: return true; 1160 case JOptionPane.NO_OPTION: return false; 1167 1161 } 1168 1162 return false; … … 1403 1397 ); 1404 1398 switch(ret) { 1405 case JOptionPane.YES_OPTION: return true;1406 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true;1407 default:1408 return false;1399 case JOptionPane.YES_OPTION: return true; 1400 case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true; 1401 default: 1402 return false; 1409 1403 } 1410 1404 }
Note:
See TracChangeset
for help on using the changeset viewer.
