Changeset 1416 for trunk

Timestamp:

07/24/19 13:23:34 (5 years ago)

Author:

bln4

Message:

Fixed font size of surrogate effecting primary.
Added comment to further document how EncryptionDetail.Type.InheritanceCheckOnSave works.

Location:

trunk/src/org/expeditee

Files:

• encryption/io/EncryptedExpWriter.java (modified) (2 diffs)
• items/Text.java (modified) (2 diffs)

trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java

@@ -203 +203 @@
                 boolean userHasKey = Label.getLabel(toWrite.getEncryptionLabel()) == LabelResult.SuccessResolveLabelToKey;
                 
+                // If we have no surrogates that inherit this property from us, and we have the label required to encrypt it, then we should entry it.
                 if (!surrogatesInherit && userHasKey) {
                         EncryptionDetail reencryptOnSave = new EncryptionDetail(EncryptionDetail.Type.ReencryptOnSave);
@@ -208 +209 @@
                         writeTagReencryptOnSave(toWrite, tags, tag);
                 } else {
+                        // If one or more surrogates still inherit from us, or we do not have the label, then we write it out unencrypted.
                         EncryptionDetail unencryptedOnSave = new EncryptionDetail(EncryptionDetail.Type.UnencryptedOnSave);
                         toWrite.setEncryptionDetailForTag(tag + "", unencryptedOnSave);

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

@@ -2269 +2269 @@
         @Override
         public float getSize() {
-                return getPaintFont().getSize();
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.FONT_STR)) {
+                        return ((Text) this.getPrimary()).getSize();
+                } else {
+                        return getPaintFont().getSize();
+                }
+                
+                //return getPaintFont().getSize();
         }
 
@@ -2298 +2304 @@
                 rebuild(true);
                 invalidateAll();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.FONT_STR, false);
+                        Item primary = getPrimary();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.FONT_STR)) {
+                                EncryptionDetail inheritanceCheckOnSave = new EncryptionDetail(EncryptionDetail.Type.InheritanceCheckOnSave);
+                                primary.primaryPropertyEncryption.put(DefaultFrameWriter.FONT_STR, inheritanceCheckOnSave);
+                        }
+                }
         }