Changeset 1477 for trunk

Timestamp:

12/03/19 15:29:07 (4 years ago)

Author:

bnemhaus

Message:

Added label existance check for when setting encryption label on a frame.

Added padlock icon on items that are encrypted.

Added key icon on items with KeyImage property set to 'PartialKey' or 'FullKey'. This will hopefully soon transformed into automatically setting these properties on key items that are on the secrets frame. The property should not be set-able by user once fully implemented and is only atm for debug purposes.

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (1 diff)
• encryption/items/KeyType.java (added)
• gui/AttributeUtils.java (modified) (1 diff)
• gui/Frame.java (modified) (2 diffs)
• items/Item.java (modified) (5 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -86 +86 @@
 public class Misc {
         
-        
-        public static String keyCharacter() {
-                return "\uD83D\uDD11";
-        }
-        
         /**
          * Causes the system to beep

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

@@ -336 +336 @@
                         _Attrib.put("EnterClick",                       Item.class.getMethod("acceptsKeyboardEnter"), 
                                                                                                 Item.class.getMethod("setAcceptsEnter", pBool));
+                        _Attrib.put("KeyImage",                         Item.class.getMethod("keyType"), 
+                                                                                                Item.class.getMethod("setKeyType", pString));
                         
                         // Aliases for attribute setting

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

@@ -47 +47 @@
 import org.expeditee.encryption.items.EncryptionPermissionTriple;
 import org.expeditee.encryption.items.surrogates.Label;
+import org.expeditee.encryption.items.surrogates.Label.LabelInfo;
+import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.gesture.Gesture;
@@ -2986 +2988 @@
         
         public void setEncryptionLabel(String label) {
+                LabelInfo labelResult = Label.getLabel(label);
+                boolean isProfileOrNone = label.equals("Profile") || label.equals("None");
+                if (!isProfileOrNone && !labelResult.is(LabelResult.SuccessResolveLabelToKey)) {
+                        MessageBay.displayMessage(labelResult.toString());
+                        this._encryptionLabel = null;
+                        return;
+                }
+                
                 this.setChanged(true);
                 _encryptionLabel = label;

trunk/src/org/expeditee/items/Item.java

@@ -40 +40 @@
 import org.expeditee.core.Dimension;
 import org.expeditee.core.Fill;
+import org.expeditee.core.Font;
 import org.expeditee.core.GradientFill;
 import org.expeditee.core.Point;
@@ -48 +49 @@
 import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.encryption.core.EncryptedImage;
+import org.expeditee.encryption.items.KeyType;
 import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.encryption.items.surrogates.EncryptionDetail.Type;
@@ -332 +334 @@
         protected Map<String, EncryptionDetail> primaryPropertyEncryption = new HashMap<String, EncryptionDetail>(primaryPropertyEncryptionDefault);
         protected Map<String, Boolean> surrogatePropertyInheritance = new HashMap<String, Boolean>(surrogatePropertyInheritanceDefault);
+
+        private KeyType keyType = KeyType.NotAKey;
         
         {
@@ -3116 +3120 @@
         protected void paintLink() {
                 paintLinkGraphic(getX() - LEFT_MARGIN, getY() + getLinkYOffset());
+                paintKeyGraphic(getX() - LEFT_MARGIN, getY() + getLinkYOffset());
+                paintPadlockGraphic(getX() - LEFT_MARGIN, getY() + getLinkYOffset());
         }
 
@@ -3175 +3181 @@
                         
                         g.setAntialiasing(false);
+                }
+        }
+
+        protected void paintKeyGraphic(int x, int y) {
+                Colour fontColour = null;
+                switch (this.keyType()) {
+                case PartialKey:
+                        fontColour = Colour.LIGHT_GRAY;
+                        break;
+                case FullKey:
+                        fontColour = Colour.BLACK;
+                        break;
+                default:
+                        return;
+                }
+                
+                GraphicsManager g = EcosystemManager.getGraphicsManager();
+                g.setAntialiasing(true);
+                Font font = new Font();
+                g.drawString("\uD83D\uDD11", new Point(x,y), font, fontColour);
+                g.setAntialiasing(false);
+        }
+        
+        protected void paintPadlockGraphic(int x, int y) {
+                String encryptionLabel = this.getEncryptionLabel();
+                if (encryptionLabel != null && encryptionLabel.length() > 0) {
+                        GraphicsManager g = EcosystemManager.getGraphicsManager();
+                        g.setAntialiasing(true);
+                        Font font = new Font();
+                        g.drawString("\uD83D\uDD12", new Point(x,y), font, Colour.BLACK);
+                        g.setAntialiasing(false);
+                }
+        }
+        
+        public KeyType keyType() {
+                return keyType;
+        }
+        
+        public void setKeyType(String s) {
+                try {
+                        keyType = KeyType.valueOf(s);
+                } catch (IllegalArgumentException e) {
+                        keyType = KeyType.NotAKey;
                 }
         }