/hg/icedtea-web: Fix JOptionPane modality problems after making ...
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Wed Mar 26 17:57:03 UTC 2014
changeset f975d5db4fbd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f975d5db4fbd
author: Andrew Azores <aazores at redhat.com>
date: Wed Mar 26 13:56:55 2014 -0400
Fix JOptionPane modality problems after making PolicyEditor itself modal
* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
JOptionPane dialog parents set correctly to JDialog or JFrame rather than
JPanel
diffstat:
ChangeLog | 9 +-
netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java | 147 ++++-----
2 files changed, 79 insertions(+), 77 deletions(-)
diffs (285 lines):
diff -r 01a37b9ad8cb -r f975d5db4fbd ChangeLog
--- a/ChangeLog Wed Mar 26 18:50:35 2014 +0100
+++ b/ChangeLog Wed Mar 26 13:56:55 2014 -0400
@@ -1,3 +1,10 @@
+2014-03-26 Andrew Azores <aazores at redhat.com>
+
+ Fix JOptionPane modality problems after making PolicyEditor itself modal
+ * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
+ JOptionPane dialog parents set correctly to JDialog or JFrame rather than
+ JPanel
+
2014-03-26 Jiri Vanek <jvanek at redhat.com>
* netx/net/sourceforge/jnlp/resources/Messages.propertie: new keys (STOAsignedMsgFully)
@@ -9,7 +16,7 @@
Added possibility to group permissions in PolicyEditor
* netx/net/sourceforge/jnlp/resources/Messages.properties: added groups names
- * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java : (setLayout)
+ * netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java: (setLayout)
added grouping panels and checkboxes. (JcheckBoxWithGroup) New inner class to work
with groups.
netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissions.java:
diff -r 01a37b9ad8cb -r f975d5db4fbd netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
--- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Wed Mar 26 18:50:35 2014 +0100
+++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java Wed Mar 26 13:56:55 2014 -0400
@@ -36,11 +36,11 @@
package net.sourceforge.jnlp.security.policyeditor;
+import static net.sourceforge.jnlp.runtime.Translator.R;
+
import java.awt.Color;
import java.awt.Container;
import java.awt.Dialog.ModalityType;
-import static net.sourceforge.jnlp.runtime.Translator.R;
-
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Window;
@@ -101,8 +101,8 @@
import javax.swing.border.LineBorder;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+
import net.sourceforge.jnlp.security.policyeditor.PolicyEditorPermissions.Group;
-
import net.sourceforge.jnlp.util.FileUtils;
import net.sourceforge.jnlp.util.FileUtils.OpenFileResult;
import net.sourceforge.jnlp.util.MD5SumWatcher;
@@ -178,8 +178,9 @@
private final WeakReference<PolicyEditor> weakThis = new WeakReference<PolicyEditor>(this);
private MD5SumWatcher fileWatcher;
- private final ActionListener okButtonAction, closeButtonAction, addCodebaseButtonAction,
+ private final ActionListener okButtonAction, addCodebaseButtonAction,
removeCodebaseButtonAction, openButtonAction, saveAsButtonAction, viewCustomButtonAction;
+ private ActionListener closeButtonAction;
private static class JCheckBoxWithGroup extends JCheckBox {
@@ -260,15 +261,6 @@
okButton.setText(R("ButApply"));
okButton.addActionListener(okButtonAction);
- closeButtonAction = new ActionListener() {
- @Override
- public void actionPerformed(final ActionEvent event) {
- quit();
- }
- };
- closeButton.setText(R("ButClose"));
- closeButton.addActionListener(closeButtonAction);
-
addCodebaseButtonAction = new ActionListener() {
@Override
public void actionPerformed(final ActionEvent e) {
@@ -364,7 +356,6 @@
w.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
w.setJMenuBar(createMenuBar(w.asWindow(), w.getPolicyEditor()));
setupPolicyEditorWindow(w.asWindow(), w.getPolicyEditor());
-
}
private static void setupPolicyEditorWindow(final Window window, final PolicyEditor editor) {
@@ -375,17 +366,44 @@
window.addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(final WindowEvent e) {
- editor.quit();
+ ((PolicyEditorWindow) window).quit();
window.dispose();
}
});
- editor.closeButton.addActionListener(new ActionListener() {
+ editor.closeButtonAction = new ActionListener() {
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ ((PolicyEditorWindow) window).quit();
+ }
+ };
+ editor.closeButton.setText(R("ButClose"));
+ editor.closeButton.addActionListener(editor.closeButtonAction);
+
+
+ final Action saveAct = new AbstractAction() {
@Override
public void actionPerformed(final ActionEvent e) {
- window.dispose();
+ editor.savePolicyFile();
}
- });
+ };
+ editor.setAccelerator(R("PEOkButtonMnemonic"), ActionEvent.ALT_MASK, saveAct, "OkButtonAccelerator");
+
+ final Action quitAct = new AbstractAction() {
+ @Override
+ public void actionPerformed(final ActionEvent e) {
+ ((PolicyEditorWindow) window).quit();
+ }
+ };
+ editor.setAccelerator(R("PECancelButtonMnemonic"), ActionEvent.ALT_MASK, quitAct, "CancelButtonAccelerator");
+
+ final Action escAct = new AbstractAction() {
+ @Override
+ public void actionPerformed(final ActionEvent e) {
+ ((PolicyEditorWindow) window).quit();
+ }
+ };
+ editor.setAccelerator(KeyEvent.VK_ESCAPE, ActionEvent.ALT_MASK, escAct, "ExitOnEscape");
}
public static interface PolicyEditorWindow {
@@ -403,6 +421,8 @@
public Window asWindow();
public void setModalityType(ModalityType modalityType);
+
+ public void quit();
}
private static class PolicyEditorFrame extends JFrame implements PolicyEditorWindow {
@@ -448,6 +468,22 @@
public void setModalityType(ModalityType type) {
//no op for frame
}
+
+ @Override
+ public void quit() {
+ if (editor.changesMade) {
+ final int save = JOptionPane.showConfirmDialog(this, R("PESaveChanges"));
+ if (save == JOptionPane.YES_OPTION) {
+ editor.savePolicyFile();
+ } else if (save == JOptionPane.CANCEL_OPTION) {
+ return;
+ }
+ }
+ editor.weakThis.clear();
+ editor.setClosed();
+ dispose();
+ }
+
}
public static PolicyEditorWindow getPolicyEditorFrame(final String filepath) {
@@ -497,6 +533,21 @@
public void setModalityType(ModalityType type) {
super.setModalityType(type);
}
+
+ @Override
+ public void quit() {
+ if (editor.changesMade) {
+ final int save = JOptionPane.showConfirmDialog(this, R("PESaveChanges"));
+ if (save == JOptionPane.YES_OPTION) {
+ editor.savePolicyFile();
+ } else if (save == JOptionPane.CANCEL_OPTION) {
+ return;
+ }
+ }
+ editor.weakThis.clear();
+ editor.setClosed();
+ dispose();
+ }
}
public static PolicyEditorWindow getPolicyEditorDialog(final String filepath) {
@@ -527,11 +578,8 @@
* Set keyboard accelerators for each major function in the editor
*/
private void setAccelerators() {
- setEscapeExit();
setAddCodebaseAccelerator();
setRemoveCodebaseAccelerator();
- setOkAccelerator();
- setCancelAccelerator();
}
/**
@@ -568,19 +616,6 @@
}
/**
- * Quit the editor when the Escape key is pressed
- */
- private void setEscapeExit() {
- final Action act = new AbstractAction() {
- @Override
- public void actionPerformed(final ActionEvent e) {
- quit();
- }
- };
- setAccelerator(KeyEvent.VK_ESCAPE, ActionEvent.ALT_MASK, act, "ExitOnEscape");
- }
-
- /**
* Add an accelerator for adding new codebases
*/
private void setAddCodebaseAccelerator() {
@@ -607,48 +642,6 @@
}
/**
- * Add an accelerator for applying changes (saving file)
- */
- private void setOkAccelerator() {
- final Action act = new AbstractAction() {
- @Override
- public void actionPerformed(final ActionEvent e) {
- savePolicyFile();
- }
- };
- setAccelerator(R("PEOkButtonMnemonic"), ActionEvent.ALT_MASK, act, "OkButtonAccelerator");
- }
-
- /**
- * Add an accelerator for quitting
- */
- private void setCancelAccelerator() {
- final Action act = new AbstractAction() {
- @Override
- public void actionPerformed(final ActionEvent e) {
- quit();
- }
- };
- setAccelerator(R("PECancelButtonMnemonic"), ActionEvent.ALT_MASK, act, "CancelButtonAccelerator");
- }
-
- /**
- * Quit, prompting the user first if there are unsaved changes
- */
- public void quit() {
- if (changesMade) {
- final int save = JOptionPane.showConfirmDialog(weakThis.get(), R("PESaveChanges"));
- if (save == JOptionPane.YES_OPTION) {
- savePolicyFile();
- } else if (save == JOptionPane.CANCEL_OPTION) {
- return;
- }
- }
- weakThis.clear();
- setClosed();
- }
-
- /**
* Add a new codebase to the editor's model. If the codebase is not a valid URL,
* the codebase is not added.
* @param codebase to be added
@@ -923,6 +916,7 @@
final GridBagConstraints checkboxConstraints = new GridBagConstraints();
checkboxConstraints.anchor = GridBagConstraints.LINE_START;
+ checkboxConstraints.fill = GridBagConstraints.HORIZONTAL;
checkboxConstraints.weightx = 0;
checkboxConstraints.weighty = 0;
checkboxConstraints.gridx = 2;
@@ -1073,6 +1067,7 @@
removeCodebaseButtonConstraints.gridx = addCodebaseButtonConstraints.gridx + 1;
removeCodebaseButtonConstraints.gridy = addCodebaseButtonConstraints.gridy;
setComponentMnemonic(removeCodebaseButton, R("PERemoveCodebaseMnemonic"));
+ removeCodebaseButton.setPreferredSize(addCodebaseButton.getPreferredSize());
add(removeCodebaseButton, removeCodebaseButtonConstraints);
final GridBagConstraints okButtonConstraints = new GridBagConstraints();
More information about the distro-pkg-dev
mailing list