Ticket #17040: 17040-pref-dlg.patch
File 17040-pref-dlg.patch, 1.7 KB (added by , 5 years ago) |
---|
-
src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
42 42 43 43 private final PreferenceTabbedPane tpPreferences = new PreferenceTabbedPane(); 44 44 private final ContextSensitiveHelpAction helpAction = new ContextSensitiveHelpAction(); 45 private final WindowEventHandler windowEventHandler = new WindowEventHandler(); 45 46 private boolean canceled; 46 47 47 48 /** … … 83 84 tpPreferences.buildGui(); 84 85 tpPreferences.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); 85 86 c.add(buildActionPanel(), BorderLayout.SOUTH); 87 addWindowListener(windowEventHandler); 86 88 87 addWindowListener(new WindowEventHandler());88 89 89 InputMapUtils.addEscapeAction(getRootPane(), new CancelAction()); 90 90 setHelpContext(HelpUtil.ht("/Action/Preferences")); 91 91 } … … 176 176 177 177 public void cancel() { 178 178 setCanceled(true); 179 setVisible(false); 180 tpPreferences.validationListeners.clear(); 179 dispose(); 181 180 } 182 181 183 182 @Override … … 201 200 } 202 201 203 202 tpPreferences.savePreferences(); 204 tpPreferences.validationListeners.clear();205 203 setCanceled(false); 206 setVisible(false);204 dispose(); 207 205 } 208 206 } 209 207 … … 213 211 new CancelAction().cancel(); 214 212 } 215 213 } 214 215 @Override 216 public void dispose() { 217 removeWindowListener(windowEventHandler); 218 super.dispose(); 219 } 216 220 }