Changeset 1861 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-07-27T18:50:48+02:00 (15 years ago)

Author:

Gubaer

Message:

added diagnostic messages for #3109 - window order generally messed up?

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RenameLayerAction.java (modified) (1 diff)
• gui/ExtendedDialog.java (modified) (2 diffs)
• gui/OptionPaneUtil.java (modified) (2 diffs)
• gui/PleaseWaitDialog.java (modified) (2 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• gui/history/HistoryBrowserDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java

@@ -65 +65 @@
         final JDialog dlg = optionPane.createDialog(Main.parent, tr("Rename layer"));
         dlg.setModal(true);
-        dlg.setAlwaysOnTop(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);

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -65 +67 @@
         bTexts = buttonTexts;
         setupDialog(lbl, buttonIcons);
-        setAlwaysOnTop(true);
+        try {
+            setAlwaysOnTop(true);
+        } catch(SecurityException e) {
+            System.out.println(tr("Warning: failed to put extended dialog always on top. Exception was: {0}", e.toString()));
+        }
         setVisible(true);
     }

trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -38 +40 @@
      */
     static protected void prepareDialog(JDialog dialog) {
-        dialog.setAlwaysOnTop(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();

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Dialog;
@@ -56 +58 @@
         // and all the other windows (relation editors, detached dialogs, etc.)
         //
-        setAlwaysOnTop(true);
+        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()));
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -200 +200 @@
         };
         final JDialog dlg = optionPane.createDialog(Main.parent, tr("Change values?"));
-        dlg.setAlwaysOnTop(true);
+        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();
 
@@ -343 +347 @@
         };
         JDialog dialog = pane.createDialog(Main.parent, tr("Change values?"));
-        dialog.setAlwaysOnTop(true);
+        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);

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -163 +163 @@
             public void actionPerformed(ActionEvent e) {
                 final JFrame f = new JFrame(name);
-                try {f.setAlwaysOnTop(true);} catch (SecurityException e1) {}
+                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);

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -69 +69 @@
     public HistoryBrowserDialog(History history) {
         super(JOptionPane.getFrameForComponent(Main.parent), false);
-        setAlwaysOnTop(true);
+        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);