/hg/icedtea-web: 2 new changesets

[aazores at icedtea.classpath.org]

changeset e9f222be36b5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e9f222be36b5
author: Andrew Azores <aazores at redhat.com>
date: Thu Mar 27 11:13:41 2014 -0400

	PolicyEditor codebase list and checkboxes visual bug fix

	Fix bug with checkboxes not correctly updating on open and with repeats of
	a codebase appearing when opening a file multiple times
	* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
	(resetCodebases) new method. (openAndParsePolicyFile) call resetCodebases
	at start. (PolicyEditor) call resetCodebases in constructor


changeset 8417559b6a12 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8417559b6a12
author: Andrew Azores <aazores at redhat.com>
date: Thu Mar 27 11:16:58 2014 -0400

	Fix NPE on Open action when changes have been made and are to be saved

	Fix NPE when trying to open a new file, with changes made, and wanting to
	save these changes to a file
	* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
	(openButtonAction) display Save As file chooser if there is no file object
	yet and user wishes to save changes


diffstat:

 ChangeLog                                                         |  16 +++++
 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java |  32 +++++++--
 2 files changed, 41 insertions(+), 7 deletions(-)

diffs (112 lines):

diff -r ede0279b5c53 -r 8417559b6a12 ChangeLog
--- a/ChangeLog	Thu Mar 27 11:08:09 2014 -0400
+++ b/ChangeLog	Thu Mar 27 11:16:58 2014 -0400
@@ -1,3 +1,19 @@
+2014-03-27  Andrew Azores  <aazores at redhat.com>
+
+	Fix NPE when trying to open a new file, with changes made, and wanting to
+	save these changes to a file
+	* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
+	(openButtonAction) display Save As file chooser if there is no file object
+	yet and user wishes to save changes
+
+2014-03-27  Andrew Azores  <aazores at redhat.com>
+
+	Fix bug with checkboxes not correctly updating on open and with repeats of
+	a codebase appearing when opening a file multiple times
+	* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
+	(resetCodebases) new method. (openAndParsePolicyFile) call resetCodebases
+	at start. (PolicyEditor) call resetCodebases in constructor
+
 2014-03-27  Andrew Azores  <aazores at redhat.com>
 
 	Applets can be temporarily granted permission levels above fully sandboxed
diff -r ede0279b5c53 -r 8417559b6a12 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
--- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java	Thu Mar 27 11:08:09 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java	Thu Mar 27 11:16:58 2014 -0400
@@ -220,6 +220,7 @@
             }
         }
     }
+
     public PolicyEditor(final String filepath) {
         super();
         setLayout(new GridBagLayout());
@@ -234,15 +235,13 @@
         if (filepath != null) {
             file = new File(filepath);
             openAndParsePolicyFile();
+        } else {
+            resetCodebases();
         }
 
         fileChooser = new JFileChooser(file);
         fileChooser.setFileHidingEnabled(false);
 
-        initializeMapForCodebase("");
-        listModel.addElement(R("PEGlobalSettings"));
-        updateCheckboxes("");
-
         okButtonAction = new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent event) {
@@ -286,6 +285,14 @@
                 if (changesMade) {
                     final int save = JOptionPane.showConfirmDialog(weakThis.get(), R("PESaveChanges"));
                     if (save == JOptionPane.YES_OPTION) {
+                        if (file == null) {
+                            final int choice = fileChooser.showSaveDialog(weakThis.get());
+                            if (choice == JFileChooser.APPROVE_OPTION) {
+                                file = fileChooser.getSelectedFile();
+                            } else if (choice == JFileChooser.CANCEL_OPTION) {
+                                return;
+                            }
+                        }
                         savePolicyFile();
                     } else if (save == JOptionPane.CANCEL_OPTION) {
                         return;
@@ -335,8 +342,6 @@
         setAccelerators();
 
         setupLayout();
-        list.setSelectedIndex(0);
-        updateCheckboxes("");
     }
     
     private String getSelectedCodebase() {
@@ -1118,6 +1123,17 @@
         customPermissionsMap.get(codebase).addAll(permissions);
     }
 
+    private void resetCodebases() {
+        listModel.clear();
+        codebasePermissionsMap.clear();
+        customPermissionsMap.clear();
+
+        initializeMapForCodebase("");
+        listModel.addElement(R("PEGlobalSettings"));
+        list.setSelectedValue(R("PEGlobalSettings"), true);
+        updateCheckboxes("");
+    }
+
     /**
      * Open the file pointed to by the filePath field. This is either provided by the
      * "-file" command line flag, or if none given, comes from DeploymentConfiguration.
@@ -1126,6 +1142,8 @@
         new Thread() {
             @Override
             public void run() {
+                resetCodebases();
+
                 if (!file.exists()) {
                     try {
                         file.createNewFile();
@@ -1215,7 +1233,7 @@
                         }
                     }
                 }
-                list.setSelectedIndex(0);
+                list.setSelectedValue(R("PEGlobalSettings"), true);
                 updateCheckboxes("");
                 try {
                     fileLock.release();