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

Timestamp:

06/21/19 15:16:05 (5 years ago)

Author:

bln4

Message:

Fixed bug with surrogate inheritance.

File:

• trunk/src/org/expeditee/items/Text.java (modified) (13 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.gio.EcosystemManager;
 import org.expeditee.gio.GraphicsManager;
@@ -51 +52 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.io.DefaultFrameWriter;
 import org.expeditee.items.MagneticConstraint.MagneticConstraints;
 import org.expeditee.math.ExpediteeJEP;
@@ -499 +501 @@
          */
         public Justification getJustification() {
-                if (_justification == null || _justification.equals(Justification.left)) {
-                        return null;
-                }
-
-                return _justification;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.JUSTIFICATION + "")) {
+                        return ((Text) this.getClassic()).getJustification();
+                } else {
+                        if (_justification == null || _justification.equals(Justification.left)) {
+                                return null;
+                        }
+
+                        return _justification;
+                }
         }
 
@@ -1295 +1303 @@
          */
         public Font getFont() {
-                return _font;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.FONT + "")) {
+                        return ((Text) this.getClassic()).getFont();
+                } else {
+                        return _font;
+                }
         }
 
@@ -1501 +1515 @@
          */
         public float getSpacing() {
-                return _spacing;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.SPACING + "")) {
+                        return ((Text) this.getClassic()).getSpacing();
+                } else {
+                        return _spacing;
+                }
         }
 
@@ -1525 +1545 @@
 
         public int getWordSpacing() {
-                return _word_spacing;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.WORD_SPACING + "")) {
+                        return ((Text) this.getClassic()).getWordSpacing();
+                } else {
+                        return _word_spacing;
+                }
         }
 
@@ -1548 +1574 @@
          */
         public float getLetterSpacing() {
-                return _letter_spacing;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LETTER_SPACING + "")) {
+                        return ((Text) this.getClassic()).getLetterSpacing();
+                } else {
+                        return _letter_spacing;
+                }
         }
 
@@ -1556 +1588 @@
 
         public float getInitialSpacing() {
-                return _initial_spacing;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.INITIAL_SPACING + "")) {
+                        return ((Text) this.getClassic()).getInitialSpacing();
+                } else {
+                        return _initial_spacing;
+                }
         }
 
@@ -3009 +3047 @@
 
         public boolean getAutoWrap() {
-                return _autoWrap;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.AUTO_WRAP_TO_SAVE + "")) {
+                        return ((Text) this.getClassic()).getAutoWrap();
+                } else {
+                        return _autoWrap;
+                }
         }
 
@@ -3145 +3189 @@
 
         public Integer getMask() {
-                if (_mask == null) {
-                        return null;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MASK + "")) {
+                        return ((Text) this.getClassic()).getMask();
                 } else {
-                        return _mask;
-                }
+                        if (_mask == null) {
+                                return null;
+                        } else {
+                                return _mask;
+                        }
+                }
+
         }
 
@@ -3157 +3208 @@
         
         public String getPlaceholder() {
-                if (_placeholder == null || _placeholder.length() == 0) {
-                        return null;
-                }
-                return _placeholder.toString();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.PLACEHOLDER + "")) {
+                        return ((Text) this.getClassic()).getPlaceholder();
+                } else {
+                        if (_placeholder == null || _placeholder.length() == 0) {
+                                return null;
+                        }
+                        return _placeholder.toString();
+                }
         }
 
@@ -3178 +3235 @@
 
         public boolean isSingleLineOnly() {
-                return _singleLine;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.SINGLE_LINE_ONLY + "")) {
+                        return ((Text) this.getClassic()).isSingleLineOnly();
+                } else {
+                        return _singleLine;
+                }
         }
 
@@ -3186 +3249 @@
         
         public int getTabIndex() {
-                return this._tabIndex;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.TAB_INDEX + "")) {
+                        return ((Text) this.getClassic()).getTabIndex();
+                } else {
+                        return this._tabIndex;
+                }
         }