Changeset 1508 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

02/03/20 14:12:59 (4 years ago)

Author:

bnemhaus

Message:

The HetrogeneousEncryptionLabels frame property is now set automatically when the owner of the frame is saving out an encrypted frame.
Also fixed some issues setting frame properties on load. For example, when loading a frame, the FrameEncryptionLabel should be set regardless of if you have permission to set the label.

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (4 diffs)

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

@@ -3008 +3008 @@
         }
         
+        public void setFrameEncryptionLabelOnLoad(String label) {
+                _encryptionLabel = label;
+        }
+        
         public void setFrameEncryptionLabel(String label) {
-                if (label == null) {
-                        _encryptionLabel = null;
+                if (label == null || label.equals(EncryptedExpWriter.getLabelNone())) {
+                        _encryptionLabel = label;
                         return;
                 }
@@ -3080 +3084 @@
         }
         
-        public void addToHetrogeneousFrameOwnerLabels(String label) {
-                if (!UserSettings.UserName.get().equals(this.getOwner())) {
-                        MessageBay.displayMessage("Only the owner of a frame is able to add hetrogeneous owner encryption labels.");
-                        return;
-                }
-                
+        public void addToHetrogeneousFrameOwnerLabels(String label) {           
                 if (_hetrogeneousEncryptionLabels == null) {
                         _hetrogeneousEncryptionLabels = new ArrayList<String>();
@@ -3094 +3093 @@
                         _hetrogeneousEncryptionLabels.add(label);
                 }
+        }
+        
+        public void clearHetrogeneousFrameOwnerLabels() {
+                if (_hetrogeneousEncryptionLabels != null) {
+                        _hetrogeneousEncryptionLabels.clear();
+                }
+        }
+        
+        public void setHomogeneousEncryptionLabelOnLoad(String label) {
+                this.setChanged(true);
+                _homogeneousEncryptionLabel = label;
         }
         
@@ -3145 +3155 @@
                 if (getGroupFrame() != null) {
                         Collection<Text> textItems = getGroupFrame().getTextItems();
+                        String membersTag = "@members: ";
                         Stream<Text> memberLists = textItems.stream().filter(t -> 
                                 t.getText().toLowerCase().startsWith("@owner: ") || 
-                                t.getText().toLowerCase().startsWith("@members: "));
+                                t.getText().toLowerCase().startsWith(membersTag));
                         for(Text t: memberLists.collect(Collectors.toList())) {
                                 if (t.getText().toLowerCase().startsWith("@owner: ")) {
                                         members.add(t.getText().substring(8));
-                                } else if (t.getText().toLowerCase().startsWith("@members: ")) {
-                                        //10
-                                        String[] split = t.getText().substring(10).split(",");
+                                } else if (t.getText().toLowerCase().startsWith(membersTag)) {
+                                        String[] split = t.getText().substring(membersTag.length()).split(",");
                                         for (String m: split) {
                                                 members.add(m.trim());