Changeset 1413 for trunk/src/org/expeditee/items/Text.java

Timestamp:

06/25/19 13:57:37 (5 years ago)

Author:

bln4

Message:

Changed surrogates to work the way discussed with David. EncryptedExpReader/Writer updated to work with this.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (30 diffs)

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

@@ -41 +41 @@
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.core.bounds.PolygonBounds;
-import org.expeditee.encryption.items.surrogates.Surrogate;
+import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.GraphicsManager;
@@ -404 +404 @@
                 rebuild(true);
                 invalidateAll();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.WIDTH_TO_SAVE_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.WIDTH_TO_SAVE_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.WIDTH_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -419 +427 @@
                 rebuild(true);
                 invalidateAll();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -434 +450 @@
         @Override
         public Integer getWidth() {
-                if (_width == null || _width <= 0) {
-                        return null;
-                }
-
-                return _width;
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.WIDTH_TO_SAVE_STR)) {
+                        return this.getClassic().getWidth();
+                } else {
+                        return _width;
+                }
         }
 
@@ -450 +466 @@
 
         public Integer getMinWidth() {
-                if (_minWidth == null || _minWidth <= 0) {
-                        return null;
-                }
-                return _minWidth;
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR)) {
+                        return this.getClassic().getMinWidth();
+                } else {
+                        return _minWidth;
+                }
         }
 
@@ -465 +482 @@
         @Override
         public Colour getHighlightColor() {
-                if (_highlightColour.equals(getPaintBackgroundColor())) {
-                        return ALTERNATE_HIGHLIGHT;
-                }
-                return _highlightColour;
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.HIGHLIGHT_STR)) {
+                        return this.getClassic().getHighlightColor();
+                } else {
+                        return _highlightColour;
+                }
         }
 
@@ -490 +508 @@
                 rebuild(true);
                 invalidateAll();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.JUSTIFICATION_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.JUSTIFICATION_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.JUSTIFICATION_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -501 +527 @@
          */
         public Justification getJustification() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.JUSTIFICATION + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.JUSTIFICATION_STR)) {
                         return ((Text) this.getClassic()).getJustification();
                 } else {
@@ -665 +689 @@
 
                 rebuild(true);
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.TEXT_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.TEXT_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.TEXT_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -1295 +1327 @@
 
                 invalidateAll();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.FONT_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.FONT_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.FONT_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -1303 +1343 @@
          */
         public Font getFont() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.FONT + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.FONT_STR)) {
                         return ((Text) this.getClassic()).getFont();
                 } else {
@@ -1469 +1507 @@
         @Override
         public String getText() {
-                return _text.toString();
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.TEXT_STR)) {
+                        return this.getClassic().getText();
+                } else {
+                        return _text.toString();
+                }
         }
 
@@ -1507 +1549 @@
                 _spacing = spacing;
                 invalidateBounds();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.SPACING_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.SPACING_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -1515 +1565 @@
          */
         public float getSpacing() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.SPACING + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.SPACING_STR)) {
                         return ((Text) this.getClassic()).getSpacing();
                 } else {
@@ -1542 +1590 @@
         public void setWordSpacing(int spacing) {
                 _word_spacing = spacing;
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.WORD_SPACING_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.WORD_SPACING_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.WORD_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
         public int getWordSpacing() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.WORD_SPACING + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.WORD_SPACING_STR)) {
                         return ((Text) this.getClassic()).getWordSpacing();
                 } else {
@@ -1567 +1621 @@
                 currentFont.setSpacing(spacing);
                 // setFont(currentFont);
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.LETTER_SPACING_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.LETTER_SPACING_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.LETTER_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -1574 +1636 @@
          */
         public float getLetterSpacing() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LETTER_SPACING + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.LETTER_SPACING_STR)) {
                         return ((Text) this.getClassic()).getLetterSpacing();
                 } else {
@@ -1585 +1645 @@
         public void setInitialSpacing(float spacing) {
                 _initial_spacing = spacing;
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.INITIAL_SPACING_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.INITIAL_SPACING_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.INITIAL_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
         public float getInitialSpacing() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.INITIAL_SPACING + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.INITIAL_SPACING_STR)) {
                         return ((Text) this.getClassic()).getInitialSpacing();
                 } else {
@@ -2795 +2861 @@
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_LEFT_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_LEFT_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_LEFT_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -2821 +2895 @@
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_RIGHT_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_RIGHT_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_RIGHT_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -2854 +2936 @@
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_TOP_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_TOP_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_TOP_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -2892 +2982 @@
                 invalidateCommonTrait(ItemAppearence.PostMoved);
                 invalidateFill();
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_BOTTOM_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_BOTTOM_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_BOTTOM_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -3047 +3145 @@
 
         public boolean getAutoWrap() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.AUTO_WRAP_TO_SAVE + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR)) {
                         return ((Text) this.getClassic()).getAutoWrap();
                 } else {
@@ -3059 +3155 @@
         // normally
         public String getAutoWrapToSave() {
-                if (!_autoWrap) {
+                if (!getAutoWrap()) {
                         return null;
                 }
@@ -3067 +3163 @@
         public void setAutoWrap(boolean autoWrap) {
                 _autoWrap = autoWrap;
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -3189 +3293 @@
 
         public Integer getMask() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MASK + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.MASK_STR)) {
                         return ((Text) this.getClassic()).getMask();
                 } else {
-                        if (_mask == null) {
-                                return null;
-                        } else {
-                                return _mask;
-                        }
-                }
-
+                        return _mask;
+                }
         }
 
         public void setMask(final Integer c) {
                 _mask = c;
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.MASK_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.MASK_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.MASK_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
         
         public String getPlaceholder() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.PLACEHOLDER + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.PLACEHOLDER_STR)) {
                         return ((Text) this.getClassic()).getPlaceholder();
                 } else {
@@ -3222 +3325 @@
         public void setPlaceholder(String _placeholder) {
                 this._placeholder = new StringBuffer(_placeholder);
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.PLACEHOLDER_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.PLACEHOLDER_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.PLACEHOLDER_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
 
@@ -3235 +3346 @@
 
         public boolean isSingleLineOnly() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.SINGLE_LINE_ONLY + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.SINGLE_LINE_ONLY_STR)) {
                         return ((Text) this.getClassic()).isSingleLineOnly();
                 } else {
@@ -3246 +3355 @@
         public void setSingleLineOnly(boolean _singleLine) {
                 this._singleLine = _singleLine;
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.SINGLE_LINE_ONLY_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }
         
         public int getTabIndex() {
-                Surrogate surrogate = Surrogate.of(this);
-                if (surrogate != null && 
-                                surrogate.isPropertyIsInherited(DefaultFrameWriter.TAB_INDEX + "")) {
+                if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.TAB_INDEX_STR)) {
                         return ((Text) this.getClassic()).getTabIndex();
                 } else {
@@ -3260 +3375 @@
         public void setTabIndex(int index) {
                 this._tabIndex = index;
+                
+                if (isSurrogate()) {
+                        surrogatePropertyInheritance.put(DefaultFrameWriter.TAB_INDEX_STR, false);
+                        Item classic = getClassic();
+                        if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.TAB_INDEX_STR)) {
+                                classic.classicPropertyEncryption.put(DefaultFrameWriter.TAB_INDEX_STR, EncryptionDetail.InheritanceCheckOnSave);
+                        }
+                }
         }