diff options
| author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-10-02 17:48:37 +0000 |
|---|---|---|
| committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-10-02 17:48:37 +0000 |
| commit | 3b59e8f40dbddf0a752d39bb7d5c8bab86546205 (patch) | |
| tree | bf69e20b958c9bdcd16b597978aa722504b1e75d /BKUCommonGUI/src/main | |
| parent | 4f1d3a5341e8ca6d67fef79650ad9914d21619ae (diff) | |
| download | mocca-3b59e8f40dbddf0a752d39bb7d5c8bab86546205.tar.gz mocca-3b59e8f40dbddf0a752d39bb7d5c8bab86546205.tar.bz2 mocca-3b59e8f40dbddf0a752d39bb7d5c8bab86546205.zip | |
[#439], [#478] MOCCA Dialog is AlwaysOnTop (follow up for [#439])
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@518 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUCommonGUI/src/main')
3 files changed, 11 insertions, 0 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java index 35a53ff7..b84a2164 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java @@ -23,6 +23,7 @@ import java.awt.Color; import java.awt.Container; import java.awt.Cursor; import java.awt.Font; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -1243,6 +1244,14 @@ public class BKUGUIImpl implements BKUGUIFacade { if (secureViewer == null) { secureViewer = new SecureViewerDialog(null, messages, helpListener.getActionListener()); + + // workaround for [#439] + // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top. + Window window = SwingUtilities.getWindowAncestor(contentPane); + if (window != null && window.isAlwaysOnTop()) { + log.debug("make secureViewer alwaysOnTop"); + secureViewer.setAlwaysOnTop(true); + } } secureViewer.setContent(dataToBeSigned); log.trace("show secure viewer returned"); diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java index 364da6ec..48393101 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java @@ -86,6 +86,7 @@ public class HelpViewer extends JDialog } dialog = new HelpViewer(frame, messages, ctx, helpURL); //, helpTopic); dialog.setVisible(true); + dialog.toFront(); } private HelpViewer(Frame frame, diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java index 6a16306b..84c2a5ff 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java @@ -239,6 +239,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener { } setVisible(true); + toFront(); } private JPanel createButtonPanel() { //ActionListener saveListener, String saveCommand) { |