Changeset 1405

Timestamp:

06/05/19 11:28:51 (5 years ago)

Author:

bln4

Message:

Added Group attribute to frames.

Some early logic on using the group attribute to determine group members. At this point just detects if the specified group doesn't actually exist. Will do more soon.

Location:

trunk/src/org/expeditee

Files:

• gui/AttributeUtils.java (modified) (1 diff)
• gui/Frame.java (modified) (2 diffs)
• gui/FrameUtils.java (modified) (1 diff)
• io/DefaultFrameReader.java (modified) (1 diff)
• io/DefaultFrameWriter.java (modified) (1 diff)

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

@@ -203 +203 @@
                         _FrameAttrib.put("EncPermission",       Frame.class.getMethod("getEncryptionPermission"), 
                                                                                                 Frame.class.getMethod("setEncryptionPermission", pEncPermission));
+                        _FrameAttrib.put("Group",                       Frame.class.getMethod("getGroup"), 
+                                                                                                Frame.class.getMethod("setGroup", pString));
                         
                         

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

@@ -178 +178 @@
 
         private String _encryptionLabel;
+        
+        private String _groupFrameName;
+        private Frame _groupFrame = null;
 
         /** Default constructor, nothing is set. */
@@ -2784 +2787 @@
         }
 
+        public String getGroup() {
+                return _groupFrameName;
+        }
+
+        public void setGroup(String _groupFrame) {
+                this._groupFrameName = _groupFrame;
+                this._groupFrame = null;
+        }
+        
+        public Frame getGroupFrame() {
+                if (this._groupFrame != null) {
+                        return this._groupFrame;
+                } else {
+                        this._groupFrame = FrameIO.LoadFrame(this._groupFrameName, FrameIO.GROUP_PATH);
+                        return this._groupFrame;
+                }
+        }
+        
+        public void setGroupFrame(Frame frame) {
+                this._groupFrame = frame;
+        }
+
         private static final class History {
                 

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

@@ -489 +489 @@
                 if (toDisplay == null) {
                         return;
+                }
+                
+                // Check if group specified that it exists.
+                String group = toDisplay.getGroup();
+                if (group != null && group.length() > 0) {
+                        Frame groupFrame = toDisplay.getGroupFrame();
+                        if (groupFrame == null) {
+                                MessageBay.displayMessage("WARNING: There is no corrosponding " + group + "1 for the specified group " + group + ".  Group permissions will not apply.");
+                        }
                 }
 

trunk/src/org/expeditee/io/DefaultFrameReader.java

@@ -96 +96 @@
                         _FrameTags.put('T', Frame.class.getMethod("addToData", pString));
                         _FrameTags.put('E', Frame.class.getMethod("setEncryptionPermission", pEncPermission));
+                        _FrameTags.put('G', Frame.class.getMethod("setGroup", pString));
 
                         // Note: As of 26/11/18 there are no unused letter item tags.  Use other characters.

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -83 +83 @@
                         _FrameTags.put('T', Frame.class.getMethod("getData"));
                         _FrameTags.put('E', Frame.class.getMethod("getEncryptionPermission"));
+                        _FrameTags.put('G', Frame.class.getMethod("getGroup"));
                         
                         // Note: As of 26/11/18 there are no unused letter item tags.  Use other characters.