Mercurial > hg > release > icedtea-web-1.7
changeset 1492:4c5b1717ab43
Allowed itw-settings to be opened from viewer
* netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: used exit instead of dispose
* netx/net/sourceforge/jnlp/resources/Messages.properties: new string with key of ButLunchFullItwSettings
* netx/net/sourceforge/jnlp/runtime/Boot.java: get rid of exit, and only return from main method
* netx/net/sourceforge/jnlp/security/SecurityDialog.java: call too showSingleCertInfoDialog changed to Window
* netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: added new button to launch ControlPanel main class
* netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java: used exit instead of dispose
* netx/net/sourceforge/swing/SwingUtils.java: (info) now accepts Window instead of JDialog
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Tue, 02 Oct 2018 10:36:29 +0200 |
| parents | 2cce11acb592 |
| children | 7f00f3fc1cf6 |
| files | ChangeLog netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java netx/net/sourceforge/jnlp/resources/Messages.properties netx/net/sourceforge/jnlp/runtime/Boot.java netx/net/sourceforge/jnlp/security/SecurityDialog.java netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java netx/net/sourceforge/swing/SwingUtils.java |
| diffstat | 8 files changed, 55 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 01 19:18:51 2018 +0200 +++ b/ChangeLog Tue Oct 02 10:36:29 2018 +0200 @@ -1,3 +1,14 @@ +2018-09-26 Jiri Vanek <jvanek@redhat.com> + + Allowed itw-settings to be opened from viewer + * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java: used exit instead of dispose + * netx/net/sourceforge/jnlp/resources/Messages.properties: new string with key of ButLunchFullItwSettings + * netx/net/sourceforge/jnlp/runtime/Boot.java: get rid of exit, and only return from main method + * netx/net/sourceforge/jnlp/security/SecurityDialog.java: call too showSingleCertInfoDialog changed to Window + * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: added new button to launch ControlPanel main class + * netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java: used exit instead of dispose + * netx/net/sourceforge/swing/SwingUtils.java: (info) now accepts Window instead of JDialog + 2018-10-01 Laurent Bourgès <bourges.laurent@gmail.com> Fixed EDT hanging
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Tue Oct 02 10:36:29 2018 +0200 @@ -54,6 +54,7 @@ import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.config.PathsAndFiles; import net.sourceforge.jnlp.controlpanel.JVMPanel.JvmValidationResult; +import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.security.viewer.CertificatePane; import net.sourceforge.jnlp.util.ImageResources; @@ -118,7 +119,7 @@ add(topPanel, BorderLayout.PAGE_START); add(mainPanel, BorderLayout.CENTER); add(buttonPanel, BorderLayout.PAGE_END); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); pack(); } @@ -184,7 +185,7 @@ if (validationResult!= JOptionPane.OK_OPTION){ return; } - ControlPanel.this.dispose(); + JNLPRuntime.exit(0); } }); buttons.add(okButton); @@ -211,7 +212,7 @@ cancelButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ControlPanel.this.dispose(); + JNLPRuntime.exit(0); } }); buttons.add(cancelButton);
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Oct 02 10:36:29 2018 +0200 @@ -13,6 +13,7 @@ ButCancel=\ Cancel\ ButClose=Close ButAdvancedOptions=Advanced Options +ButLunchFullItwSettings=Launch full settings ButCopy=Copy to Clipboard ButMoreInformation=More Information... ButOk=OK
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Tue Oct 02 10:36:29 2018 +0200 @@ -113,16 +113,13 @@ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.VIEWER)) { try { - SwingUtils.invokeAndWait(new Runnable() { - @Override - public void run() { - CertificateViewer.showCertificateViewer(); - } - }); + CertificateViewer.main(null); } catch (Exception e) { OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e); + } finally { + //no metter what happens, terminate + return; } - JNLPRuntime.exit(0); } if (optionParser.hasOption(OptionsDefinitions.OPTIONS.VERSION)) { @@ -192,7 +189,7 @@ if (optionParser.hasOption(OptionsDefinitions.OPTIONS.REDIRECT)) { JNLPRuntime.setAllowRedirect(true); } - + //if it is browser go by ots own, otherwise procedd with normal ITW logic if (optionParser.hasOption(OptionsDefinitions.OPTIONS.BROWSER)) { String url = optionParser.getParam(OptionsDefinitions.OPTIONS.BROWSER); @@ -240,7 +237,7 @@ static String fixJnlpProtocol(String param) { //remove jnlp: for case like jnlp:https://some.app/file.jnlp - if (param.matches("^jnlp[s]?:.*://.*")){ + if (param.matches("^jnlp[s]?:.*://.*")) { param = param.replaceFirst("^jnlp[s]?:", ""); } //transalte jnlp://some.app/file.jnlp to http/https
--- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java Tue Oct 02 10:36:29 2018 +0200 @@ -46,6 +46,7 @@ import java.security.cert.X509Certificate; import javax.swing.JDialog; +import java.awt.Window; import net.sourceforge.swing.SwingUtils; import net.sourceforge.jnlp.JNLPFile; @@ -216,7 +217,7 @@ * @param parent the parent pane. */ public static void showSingleCertInfoDialog(X509Certificate c, - JDialog parent) { + Window parent) { SecurityDialog dialog = new SecurityDialog(DialogType.SINGLE_CERT_INFO, c); dialog.getViwableDialog().setLocationRelativeTo(parent); dialog.getViwableDialog().setModalityType(ModalityType.APPLICATION_MODAL);
--- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Tue Oct 02 10:36:29 2018 +0200 @@ -59,7 +59,6 @@ import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JComponent; -import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -69,9 +68,11 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; +import java.awt.Window; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; +import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.security.CertificateUtils; import net.sourceforge.jnlp.security.KeyStores; @@ -115,7 +116,7 @@ /** JComponents that should be disbled for system store */ private final List<JComponent> disableForSystem; - private JDialog parent; + private Window parent; private JComponent defaultFocusComponent = null; /** @@ -124,7 +125,7 @@ */ private KeyStores.KeyStoreWithPath keyStore = null; - public CertificatePane(JDialog parent) { + public CertificatePane(Window parent) { super(); this.parent = parent; @@ -246,6 +247,11 @@ closeButton.addActionListener(new CloseButtonListener()); defaultFocusComponent = closeButton; closePanel.add(closeButton, BorderLayout.EAST); + + JButton openAll = new JButton(R("ButLunchFullItwSettings")); + openAll.addActionListener(new FullSettingsButtonListener()); + closePanel.add(openAll, BorderLayout.WEST); + main.add(closePanel, BorderLayout.SOUTH); } @@ -537,7 +543,22 @@ private class CloseButtonListener implements ActionListener { @Override public void actionPerformed(ActionEvent e) { - parent.dispose(); + JNLPRuntime.exit(0); + } + } + + private class FullSettingsButtonListener implements ActionListener { + + @Override + public void actionPerformed(ActionEvent e) { + try { + net.sourceforge.jnlp.controlpanel.ControlPanel.main(new String[0]); + parent.dispose(); + } catch (Exception ex) { + OutputController.getLogger().log(ex); + JOptionPane.showMessageDialog(parent, ex); + + } } }
--- a/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificateViewer.java Tue Oct 02 10:36:29 2018 +0200 @@ -41,18 +41,17 @@ import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Frame; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.JDialog; +import javax.swing.JFrame; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.jnlp.util.ImageResources; import net.sourceforge.jnlp.util.ScreenFinder; import net.sourceforge.swing.SwingUtils; -public class CertificateViewer extends JDialog { +public class CertificateViewer extends JFrame { private boolean initialized = false; private static final String dialogTitle = R("CVCertificateViewer"); @@ -60,7 +59,8 @@ CertificatePane panel; public CertificateViewer() { - super((Frame) null, dialogTitle, true); + super(dialogTitle); + this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.setName("CertificateViewer"); SwingUtils.info(this); setIconImages(ImageResources.INSTANCE.getApplicationImages()); @@ -98,14 +98,13 @@ ScreenFinder.centerWindowsToCurrentScreen(this); } - public static void showCertificateViewer() { + private static void showCertificateViewer() { JNLPRuntime.initialize(true); CertificateViewer cv = new CertificateViewer(); cv.setResizable(true); cv.centerDialog(); cv.setVisible(true); - cv.dispose(); } public static void main(String[] args) throws Exception {
--- a/netx/net/sourceforge/swing/SwingUtils.java Mon Oct 01 19:18:51 2018 +0200 +++ b/netx/net/sourceforge/swing/SwingUtils.java Tue Oct 02 10:36:29 2018 +0200 @@ -47,7 +47,6 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.swing.JDialog; import javax.swing.JWindow; import javax.swing.SwingUtilities; import net.sourceforge.jnlp.runtime.Translator; @@ -80,7 +79,7 @@ new Throwable().printStackTrace(); } - public static void info(final JDialog dialog) { + public static void info(final Window dialog) { if (INFO_DIALOG) { trace("Dialog[" + dialog.getName() + "]" + " in TG [" + Thread.currentThread().getThreadGroup() + "]");