Index: /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 1987) @@ -65,10 +65,4 @@ final JDialog dlg = optionPane.createDialog(Main.parent, tr("Rename layer")); dlg.setModal(true); - try { - dlg.setAlwaysOnTop(true); - } catch(SecurityException ex) { - System.out.println(tr("Warning: failed to put a dialog always on top. Exception was: {0}", ex.toString())); - } - dlg.toFront(); dlg.setVisible(true); Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 1987) @@ -139,18 +139,4 @@ setSize(d); setLocationRelativeTo(parent); - - // temporary fix for "#3181 : Dialogs causes JOSM window to be set as "always on top", preventing switchiong to - // other windows." - // See also {@see OptionPaneUtil} - // - if (Main.pref.getBoolean("window-handling.option-pane-always-on-top", true)) { - // try to put always on top - // - try { - setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: failed to bring extended dialog always on top. Exception: {0}", e.toString())); - } - } } Index: /trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java (revision 1987) @@ -1,6 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.gui; - -import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Component; @@ -27,4 +25,5 @@ * */ +@Deprecated public class OptionPaneUtil { @@ -41,22 +40,9 @@ */ static protected void prepareDialog(JDialog dialog) { - - // always on top can be disabled in a configuration option. This is necessary - // for some WM on Linux, i.e. fluxbox. There, always-on-top propagates to the - // parent window, i.e. the JOSM window itself. - // // FIXME: this is a temporary solution. I'm still looking for an approach which // works across all OS and WMs. Can we get rid of "always-on-top" in JOSM // completely? // - if (Main.pref.getBoolean("window-handling.option-pane-always-on-top", true)) { - try { - dialog.setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: failed to put option pane dialog always on top. Exception was: {0}", e.toString())); - } - } dialog.setModal(true); - dialog.toFront(); dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); } Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 1987) @@ -55,12 +55,4 @@ } }); - // make sure this dialog is always on top of the main JOSM window - // and all the other windows (relation editors, detached dialogs, etc.) - // - try { - setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: failed to put ''please wait dialog'' always on top. Exception was: {0}", e.toString())); - } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 1987) @@ -136,9 +136,4 @@ protected void build() { updateTitle(); - try { - setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. Exception: {0}", e.toString())); - } getContentPane().setLayout(new BorderLayout()); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 1987) @@ -208,10 +208,4 @@ }; final JDialog dlg = optionPane.createDialog(Main.parent, tr("Change values?")); - try { - dlg.setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: failed to put properties dialog always on top. Exception was: {0}", e.toString())); - } - dlg.toFront(); values.getEditor().addActionListener(new ActionListener() { @@ -355,10 +349,4 @@ }; JDialog dialog = pane.createDialog(Main.parent, tr("Change values?")); - try { - dialog.setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: failed to put dialog always on top. Exception was: {0}", e.toString())); - } - dialog.toFront(); dialog.setVisible(true); @@ -481,16 +469,16 @@ String str = null; switch (column) { - case 0: - str = (String) value; - break; - case 1: - Map v = (Map) value; - if (v.size()!=1) { - str=tr(""); - c.setFont(c.getFont().deriveFont(Font.ITALIC)); - } else { - str=v.entrySet().iterator().next().getKey(); - } - break; + case 0: + str = (String) value; + break; + case 1: + Map v = (Map) value; + if (v.size()!=1) { + str=tr(""); + c.setFont(c.getFont().deriveFont(Font.ITALIC)); + } else { + str=v.entrySet().iterator().next().getKey(); + } + break; } ((JLabel)c).setText(str); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 1987) @@ -163,8 +163,4 @@ public void actionPerformed(ActionEvent e) { final JFrame f = new JFrame(name); - try {f.setAlwaysOnTop(true);} - catch (SecurityException e1) { - System.out.println(tr("Warning: failed to put toggle dialog always on top. Exception was: {0}", e1.toString())); - } parent.remove(ToggleDialog.this); f.getContentPane().add(ToggleDialog.this); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 1987) @@ -181,10 +181,4 @@ setSize(findMaxDialogSize()); - try { - setAlwaysOnTop(true); - } catch (SecurityException e) { - logger.warning(tr("Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}", e - .toString())); - } addWindowListener( @@ -689,10 +683,10 @@ ); switch(ret) { - case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return; - case JOptionPane.CLOSED_OPTION: return; - case JOptionPane.NO_OPTION: return; - case JOptionPane.YES_OPTION: - memberTableModel.removeMembersReferringTo(toCheck); - break; + case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return; + case JOptionPane.CLOSED_OPTION: return; + case JOptionPane.NO_OPTION: return; + case JOptionPane.YES_OPTION: + memberTableModel.removeMembersReferringTo(toCheck); + break; } } @@ -727,9 +721,9 @@ ); switch(ret) { - case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true; - case JOptionPane.YES_OPTION: return true; - case JOptionPane.NO_OPTION: return false; - case JOptionPane.CLOSED_OPTION: return false; - case JOptionPane.CANCEL_OPTION: throw new AddAbortException(); + case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION : return true; + case JOptionPane.YES_OPTION: return true; + case JOptionPane.NO_OPTION: return false; + case JOptionPane.CLOSED_OPTION: return false; + case JOptionPane.CANCEL_OPTION: throw new AddAbortException(); } // should not happen @@ -1162,7 +1156,7 @@ ); switch(ret) { - case JOptionPane.CANCEL_OPTION: return false; - case JOptionPane.YES_OPTION: return true; - case JOptionPane.NO_OPTION: return false; + case JOptionPane.CANCEL_OPTION: return false; + case JOptionPane.YES_OPTION: return true; + case JOptionPane.NO_OPTION: return false; } return false; @@ -1403,8 +1397,8 @@ ); switch(ret) { - case JOptionPane.YES_OPTION: return true; - case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true; - default: - return false; + case JOptionPane.YES_OPTION: return true; + case ConditionalOptionPaneUtil.DIALOG_DISABLED_OPTION: return true; + default: + return false; } } Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 1986) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 1987) @@ -69,9 +69,4 @@ public HistoryBrowserDialog(History history) { super(JOptionPane.getFrameForComponent(Main.parent), false); - try { - setAlwaysOnTop(true); - } catch(SecurityException e) { - System.out.println(tr("Warning: failed to put history browser always on top. Exception was: {0}", e.toString())); - } build(); setHistory(history);