Changeset 1374 for trunk

Timestamp:

05/24/19 14:51:06 (5 years ago)

Author:

bln4

Message:

Implemented EncryptionPermission attribute.

EncryptionPermission is a triple. When specifying the value, if you do not specify the 2nd (group) or 3rd (other) then they default to permission level zero.

Location:

trunk/src/org/expeditee

Files:

• encryption/items (added)
• encryption/items/EncryptionPermissionTriple.java (added)
• encryption/items/UserAppliedEncryptionPermission.java (added)
• gui/AttributeUtils.java (modified) (4 diffs)
• gui/Frame.java (modified) (3 diffs)
• io/Conversion.java (modified) (2 diffs)
• io/DefaultFrameReader.java (modified) (3 diffs)
• io/DefaultFrameWriter.java (modified) (1 diff)

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

@@ -28 +28 @@
 import org.expeditee.core.Font;
 import org.expeditee.core.Point;
+import org.expeditee.encryption.items.EncryptionPermissionTriple;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.DotType;
@@ -147 +148 @@
                         Class<?>[] pPermission = { PermissionPair.class };
                         Class<?>[] pDotType = { DotType.class };
+                        Class<?>[] pEncPermission = { EncryptionPermissionTriple.class };
                         
                         _IgnoreSet = new LinkedList<String>();
@@ -199 +201 @@
                         _FrameAttrib.put("EncryptionLabel", Frame.class.getMethod("getEncryptionLabel"), 
                                                                                                 Frame.class.getMethod("setEncryptionLabel", pString));
+                        _FrameAttrib.put("EncPermission",       Frame.class.getMethod("getEncryptionPermission"), 
+                                                                                                Frame.class.getMethod("setEncryptionPermission", pEncPermission));
                         
                         
@@ -206 +210 @@
                         _FrameAttrib.alias("p",         "permission");
                         _FrameAttrib.alias("enc",               "encryptionlabel");
+                        _FrameAttrib.alias("encp",              "encpermission");
                         
                         

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

@@ -36 +36 @@
 import org.expeditee.core.Image;
 import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.encryption.items.EncryptionPermissionTriple;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.gesture.Gesture;
@@ -100 +101 @@
 
         private PermissionPair _permissionPair = null;
+        
+        private EncryptionPermissionTriple _encPermissionTriple = null;
 
         private String _owner = null;
@@ -2771 +2774 @@
                 _encryptionLabel = label;
         }
+        
+        public EncryptionPermissionTriple getEncryptionPermission() {
+                return _encPermissionTriple;
+        }
+        
+        public void setEncryptionPermission(EncryptionPermissionTriple p) {
+                _encPermissionTriple = p;
+        }
 
         private static final class History {

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

@@ -522 +522 @@
                 value = value.trim();
 
-                if ((method.getParameterTypes()[0].isEnum()) || (name.matches("setPermission"))) {
+                if ((method.getParameterTypes()[0].isEnum()) || (name.matches("setPermission")) || (name.matches("setEncryptionPermission"))) {
                         Method convertString;
                         Object[] objects = new Object[1];
@@ -650 +650 @@
                 }
 
-                if ((method.getReturnType().isEnum()) || (name.equals("getPermission"))) {
+                if ((method.getReturnType().isEnum()) || (name.equals("getPermission")) || (name.equals("getEncryptionPermission"))) {
                         try {
                                 return output.getClass().getMethod("getCode", new Class[] {})

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

@@ -33 +33 @@
 import org.expeditee.core.Font;
 import org.expeditee.core.Point;
+import org.expeditee.encryption.items.EncryptionPermissionTriple;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Constraint;
@@ -70 +71 @@
         protected static Class[] pPermission = { PermissionPair.class };
         protected static Class[] pDotType = { DotType.class };
+        protected static Class[] pEncPermission = { EncryptionPermissionTriple.class };
         
         public DefaultFrameReader(){
@@ -93 +95 @@
                         _FrameTags.put('K', Frame.class.getMethod("setEncryptionLabel", pString));
                         _FrameTags.put('T', Frame.class.getMethod("addToData", pString));
+                        _FrameTags.put('E', Frame.class.getMethod("setEncryptionPermission", pEncPermission));
 
                         // Note: As of 26/11/18 there are no unused letter item tags.  Use other characters.

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

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