Changeset 1491 for trunk

Timestamp:

12/04/19 17:11:03 (4 years ago)

Author:

bnemhaus

Message:

Clean up of code at David's request.

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (1 diff)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -1145 +1145 @@
                         // if its a new frame or an existing Exp frame...
                         if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {       
-                                
-                                // *** Don't you need to take the *name* of the frame in to account????
-                                // *** to rule out the credentials frame?
-                                String framesetName = toSave.getFramesetName();
-                                String enryptionLabel = toSave.getEncryptionLabel();
-                                
-                                if (toSave.getNumber() != AuthenticatorBrowser.CREDENTIALS_FRAME && 
-                                                toSave.getEncryptionLabel() != null) {
-                                        // *** wasted repeat of getEncryptionLabel()
-                                        // does the order of the above if statement matter?
-                                        writer = new EncryptedExpWriter(toSave.getEncryptionLabel());
-                                        // **** If this doesn't take an encryption label, then why bother
-                                        // making it explicitly the EcryptedExpReader, given that 
-                                        // 'redirectTo()' below doesn't
-                                        savedVersion = EncryptedExpReader.getVersion(fullPath);
+                                                                
+                                if (toSave.isEncryptableFrame()) {
+                                        String encryptionLabel = toSave.getEncryptionLabel();
+                                        writer = new EncryptedExpWriter(encryptionLabel);
                                 } else {
                                         writer = new ExpWriter();
-                                        savedVersion = ExpReader.getVersion(fullPath);
                                 }
+                                savedVersion = ExpReader.getVersion(fullPath);
                                 
                                 // Is the file this would be saved to a redirect?