Changeset 1410 for trunk/src/org/expeditee/items

Timestamp:

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

Author:

bln4

Message:

Fixed bug with surrogate inheritance.

Location:

trunk/src/org/expeditee/items

Files:

• Item.java (modified) (29 diffs)
• Text.java (modified) (13 diffs)

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

@@ -418 +418 @@
 
         public DotType getDotType() {
-                return _type;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.DOT_TYPE + "")) {
+                        return this.getClassic().getDotType();
+                } else {
+                        return _type;
+                }
         }
 
@@ -430 +436 @@
 
         public boolean getFilled() {
-                return _filled;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.FILLED + "")) {
+                        return this.getClassic().getFilled();
+                } else {
+                        return _filled;
+                }
         }
 
@@ -457 +469 @@
          */
         public double getGradientAngle() {
-                return _gradientAngle;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.GRADIENT_ANGLE + "")) {
+                        return this.getClassic().getGradientAngle();
+                } else {
+                        return _gradientAngle;
+                }
         }
 
@@ -513 +531 @@
         
         public PermissionTriple getPermission() {
-                return _permissionTriple;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.PERMISSION + "")) {
+                        return this.getClassic().getPermission();
+                } else {
+                        return _permissionTriple;
+                }
         }
 
@@ -659 +683 @@
          */
         public List<String> getAction() {
-                return _actions;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ACTION + "")) {
+                        return this.getClassic().getAction();
+                } else {
+                        return _actions;
+                }
         }
 
         public List<String> getData() {
-                return _data.getData();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.DATA + "")) {
+                        return this.getClassic().getData();
+                } else {
+                        return _data.getData();
+                }
         }
 
         public List<String> getActionCursorEnter() {
-                return _actionCursorEnter;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ACTION_CURSOR_ENTER + "")) {
+                        return this.getClassic().getActionCursorEnter();
+                } else {
+                        return _actionCursorEnter;
+                }
         }
 
         public List<String> getActionCursorLeave() {
-                return _actionCursorLeave;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ACTION_CURSOR_LEAVE + "")) {
+                        return this.getClassic().getActionCursorLeave();
+                } else {
+                        return _actionCursorLeave;
+                }
         }
 
         public List<String> getActionEnterFrame() {
-                return _actionEnterFrame;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ACTION_ENTER_FRAME + "")) {
+                        return this.getClassic().getActionEnterFrame();
+                } else {
+                        return _actionEnterFrame;
+                }
         }
 
         public List<String> getActionLeaveFrame() {
-                return _actionLeaveFrame;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ACTION_LEAVE_FRAME + "")) {
+                        return this.getClassic().getActionLeaveFrame();
+                } else {
+                        return _actionLeaveFrame;
+                }
         }
 
         public boolean getActionMark() {
-                return _actionMark;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ACTION_MARK + "")) {
+                        return this.getClassic().getActionMark();
+                } else {
+                        return _actionMark;
+                }
         }
 
@@ -703 +769 @@
         }*/
 
-        public String getArrow()
-        {
-                if (!hasVisibleArrow())
-                        return null;
-
-                String ratio = "" + getArrowheadRatio();
-                if (ratio.length() - ratio.indexOf(".") > 2)
-                        ratio = ratio.substring(0, ratio.indexOf(".") + 3);
-
-                return getArrowheadLength() + " " + ratio + " " + getArrowheadNibPerc();
+        public String getArrow() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ARROW + "")) {
+                        return this.getClassic().getArrow();
+                } else {
+                        if (!hasVisibleArrow())
+                                return null;
+
+                        String ratio = "" + getArrowheadRatio();
+                        if (ratio.length() - ratio.indexOf(".") > 2)
+                                ratio = ratio.substring(0, ratio.indexOf(".") + 3);
+
+                        return getArrowheadLength() + " " + ratio + " " + getArrowheadNibPerc();
+                }
         }
 
@@ -735 +806 @@
         }
         
-        public Colour getBackgroundColor()
-        {
-                return _backgroundColour;
-        }
-
-        public Colour getBorderColor()
-        {
-                return _colorBorder;
+        public Colour getBackgroundColor() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.BACKGROUND_COLOR + "")) {
+                        return this.getClassic().getBackgroundColor();
+                } else {
+                        return _backgroundColour;
+                }
+        }
+
+        public Colour getBorderColor() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.TYPE_AND_ID + "")) {
+                        return this.getClassic().getBorderColor();
+                } else {
+                        return _colorBorder;
+                }
         }
 
@@ -814 +895 @@
         }
 
-        public Colour getColor()
-        {
-                return _foregroundColour;
+        public Colour getColor() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.COLOR + "")) {
+                        return this.getClassic().getColor();
+                } else {
+                        return _foregroundColour;
+                }
         }
 
@@ -828 +914 @@
         }
 
-        public String getConstraintIDs()
-        {
-                if (_constraints == null || _constraints.size() == 0)
-                        return null;
-
-                String cons = "";
-
-                for (Constraint c : _constraints)
-                        cons += c.getID() + " ";
-
-                return cons.trim();
+        public String getConstraintIDs() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.CONSTRAINT_IDS + "")) {
+                        return this.getClassic().getConstraintIDs();
+                } else {
+                        if (_constraints == null || _constraints.size() == 0)
+                                return null;
+
+                        String cons = "";
+
+                        for (Constraint c : _constraints)
+                                cons += c.getID() + " ";
+
+                        return cons.trim();
+                }
         }
 
@@ -862 +953 @@
         }
 
-        public String getDateCreated()
-        {
-                return _creationDate;
-        }
-
-        public Colour getFillColor()
-        {
-                return _fillColour;
-        }
-
-        public String getFillPattern()
-        {
-                return _fillPattern;
+        public String getDateCreated() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.DATE_CREATED + "")) {
+                        return this.getClassic().getDateCreated();
+                } else {
+                        return _creationDate;
+                }
+        }
+
+        public Colour getFillColor() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.FILL_COLOR + "")) {
+                        return this.getClassic().getFillColor();
+                } else {
+                        return _fillColour;
+                }
+        }
+
+        public String getFillPattern() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.FILL_PATTERN + "")) {
+                        return this.getClassic().getFillPattern();
+                } else {
+                        return _fillPattern;
+                }
         }
 
@@ -890 +996 @@
          * @return The value of <code>_highlight</code>.
          */
-        public boolean getHighlight()
-        {
-                return _highlight;
+        public boolean getHighlight() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.HIGHLIGHT + "")) {
+                        return this.getClassic().getHighlight();
+                } else {
+                        return _highlight;
+                }
         }
 
@@ -919 +1030 @@
          * @return The list of Line IDs that this point is part of.
          */
-        public String getLineIDs()
-        {
-                String lineID = null;
-
-                if (_lines.size() > 0) {
-                        lineID = "" + _lines.get(0).getID();
-
-                        for (int i = 1; i < _lines.size(); i++)
-                                lineID += " " + _lines.get(i).getID();
-                }
-
-                return lineID;
-        }
-
-        public int[] getLinePattern()
-        {
-                return _linePattern;
+        public String getLineIDs() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINE_IDS + "")) {
+                        return this.getClassic().getLineIDs();
+                } else {
+                        String lineID = null;
+
+                        if (_lines.size() > 0) {
+                                lineID = "" + _lines.get(0).getID();
+
+                                for (int i = 1; i < _lines.size(); i++)
+                                        lineID += " " + _lines.get(i).getID();
+                        }
+
+                        return lineID;
+                }
+        }
+
+        public int[] getLinePattern() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINE_PATTERN + "")) {
+                        return this.getClassic().getLinePattern();
+                } else {
+                        return _linePattern;
+                }
         }
 
@@ -956 +1077 @@
          *         this Item does not link to anything.
          */
-        public String getLink()
-        {
-                return _link;
-        }
-
-        public String getFormula()
-        {
-                return _formula;
+        public String getLink() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINK + "")) {
+                        return this.getClassic().getLink();
+                } else {
+                        return _link;
+                }
+        }
+
+        public String getFormula() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.FORMULA + "")) {
+                        return this.getClassic().getFormula();
+                } else {
+                        return _formula;
+                }
         }
 
@@ -987 +1118 @@
         }
 
-        public String getLinkFrameset()
-        {
-                return _link_frameset;
-        }
-
-        public boolean getLinkMark()
-        {
-                return _linkMark;
-        }
-
-        public String getLinkTemplate()
-        {
-                return _link_template;
+        public String getLinkFrameset() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINK_FRAMESET + "")) {
+                        return this.getClassic().getLinkFrameset();
+                } else {
+                        return _link_frameset;
+                }
+        }
+
+        public boolean getLinkMark() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINK_MARK + "")) {
+                        return this.getClassic().getLinkMark();
+                } else {
+                        return _linkMark;
+                }
+        }
+
+        public String getLinkTemplate() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINK_TEMPLATE + "")) {
+                        return this.getClassic().getLinkTemplate();
+                } else {
+                        return _link_template;
+                }
         }
 
@@ -1012 +1158 @@
         }
 
-        public String getOwner()
-        {
-                return _owner;
+        public String getOwner() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.OWNER + "")) {
+                        return this.getClassic().getOwner();
+                } else {
+                        return _owner;
+                }
         }
 
@@ -1129 +1280 @@
 
         /** Gets the position of this item. */
-        public final Point getPosition()
-        {
-                return new Point(getX(), getY());
+        public final Point getPosition() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.POSITION + "")) {
+                        return this.getClassic().getPosition();
+                } else {
+                        return new Point(getX(), getY());
+                }
         }
 
@@ -1156 +1312 @@
         }
 
-        public String getTypeAndID()
-        {
-                return "T " + getID();
-        }
-
-        public Integer getWidthToSave()
-        {
-                return getWidth();
+        public String getTypeAndID() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.TYPE_AND_ID + "")) {
+                        return this.getClassic().getTypeAndID();
+                } else {
+                        return "T " + getID();
+                }
+        }
+
+        public Integer getWidthToSave() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.WIDTH_TO_SAVE + "")) {
+                        return this.getClassic().getWidthToSave();
+                } else {
+                        return getWidth();
+                }
         }
         
         public Integer getMinWidthToSave() {
-                return getMinWidth();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MIN_WIDTH_TO_SAVE + "")) {
+                        return this.getClassic().getMinWidthToSave();
+                } else {
+                        return getMinWidth();
+                }
         }
 
@@ -1189 +1361 @@
          * @return The X coordinate of this Item on the screen
          */
-        public int getX()
-        {
-                return Math.round(_x);
+        public int getX() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.POSITION + "")) {
+                        return this.getClassic().getX();
+                } else {
+                        return Math.round(_x);
+                }
         }
 
@@ -1199 +1376 @@
          * @return The Y coordinate of this Item on the screen
          */
-        public int getY()
-        {
-                return Math.round(_y);
+        public int getY() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.POSITION + "")) {
+                        return this.getClassic().getY();
+                } else {
+                        return Math.round(_y);
+                }
         }
 
@@ -1357 +1539 @@
         }
         
-        public List<String> getTooltip()
-        {
-                return _tooltip.asStringList();
+        public List<String> getTooltip() {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.TOOLTIP + "")) {
+                        return this.getClassic().getTooltip();
+                } else {
+                        return _tooltip.asStringList();
+                }
         }
         
@@ -1836 +2023 @@
 
         public Colour getGradientColor() {
-                return _gradientColour;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.GRADIENT_COLOR + "")) {
+                        return this.getClassic().getGradientColor();
+                } else {
+                        return _gradientColour;
+                }
         }
 
@@ -1924 +2117 @@
         
         public boolean getLinkHistory() {
-                return _linkHistory;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.LINK_HISTORY + "")) {
+                        return this.getClassic().getLinkHistory();
+                } else {
+                        return _linkHistory;
+                }
         }
 
@@ -2251 +2450 @@
          *         set).
          */
-        public float getThickness()
-        {
-                return _thickness;
+        public float getThickness()     {
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.THICKNESS + "")) {
+                        return this.getClassic().getThickness();
+                } else {
+                        return _thickness;
+                }
         }
 
@@ -3160 +3364 @@
 
         public Integer getAnchorLeft() {
-                return _anchoring.getLeftAnchor();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ANCHOR_LEFT + "")) {
+                        return this.getClassic().getAnchorLeft();
+                } else {
+                        return _anchoring.getLeftAnchor();
+                }
         }
 
         public Integer getAnchorRight() {
-                return _anchoring.getRightAnchor();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ANCHOR_RIGHT + "")) {
+                        return this.getClassic().getAnchorRight();
+                } else {
+                        return _anchoring.getRightAnchor();
+                }
         }
 
         public Integer getAnchorTop() {
-                return _anchoring.getTopAnchor();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ANCHOR_TOP + "")) {
+                        return this.getClassic().getAnchorTop();
+                } else {
+                        return _anchoring.getTopAnchor();
+                }
         }
 
         public Integer getAnchorBottom() {
-                return _anchoring.getBottomAnchor();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ANCHOR_BOTTOM + "")) {
+                        return this.getClassic().getAnchorBottom();
+                } else {
+                        return _anchoring.getBottomAnchor();
+                }
         }
 
         public String getText() {
-                return "@" + getClass().getSimpleName() + ":" + getID();
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.TEXT + "")) {
+                        return this.getClassic().getText();
+                } else {
+                        return "@" + getClass().getSimpleName() + ":" + getID();
+                }
         }
 
@@ -3412 +3646 @@
         
         public int getMagnetizedItemLeft() {
-                if(_magnetizedItemLeft != null) return _magnetizedItemLeft.getID();
-                else return -1;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MAGNETIZED_ITEM_LEFT + "")) {
+                        return this.getClassic().getMagnetizedItemLeft();
+                } else {
+                        if(_magnetizedItemLeft != null) return _magnetizedItemLeft.getID();
+                        else return -1;
+                }
         }
         
@@ -3425 +3665 @@
         
         public int getMagnetizedItemRight() {
-                if(_magnetizedItemRight != null) return _magnetizedItemRight.getID();
-                else return -1;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MAGNETIZED_ITEM_RIGHT + "")) {
+                        return this.getClassic().getMagnetizedItemRight();
+                } else {
+                        if(_magnetizedItemRight != null) return _magnetizedItemRight.getID();
+                        else return -1;
+                }
         }
         
@@ -3438 +3684 @@
         
         public int getMagnetizedItemTop() {
-                if(_magnetizedItemTop != null) return _magnetizedItemTop.getID();
-                else return -1;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MAGNETIZED_ITEM_TOP + "")) {
+                        return this.getClassic().getMagnetizedItemTop();
+                } else {
+                        if(_magnetizedItemTop != null) return _magnetizedItemTop.getID();
+                        else return -1;
+                }
         }
         
@@ -3451 +3703 @@
         
         public int getMagnetizedItemBottom() {
-                if(_magnetizedItemBottom != null) return _magnetizedItemBottom.getID();
-                else return -1;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.MAGNETIZED_ITEM_BOTTOM + "")) {
+                        return this.getClassic().getMagnetizedItemBottom();
+                } else {
+                        if(_magnetizedItemBottom != null) return _magnetizedItemBottom.getID();
+                        else return -1;
+                }
         }
         
@@ -3464 +3722 @@
         
         public String getEncryptionLabel() {
-                return _encryptionLabel;
+                Surrogate surrogate = Surrogate.of(this);
+                if (surrogate != null && 
+                                surrogate.isPropertyIsInherited(DefaultFrameWriter.ENCRYPTION_LABEL + "")) {
+                        return this.getClassic().getEncryptionLabel();
+                } else {
+                        return _encryptionLabel;
+                }
         }
         

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;
+                }
         }