Changeset 1414 for trunk/src/org/expeditee/items/Text.java
- Timestamp:
- 06/26/19 16:02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/items/Text.java
r1413 r1414 407 407 if (isSurrogate()) { 408 408 surrogatePropertyInheritance.put(DefaultFrameWriter.WIDTH_TO_SAVE_STR, false); 409 Item classic = getClassic();409 Item primary = getPrimary(); 410 410 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.WIDTH_TO_SAVE_STR)) { 411 classic.classicPropertyEncryption.put(DefaultFrameWriter.WIDTH_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave);411 primary.primaryPropertyEncryption.put(DefaultFrameWriter.WIDTH_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave); 412 412 } 413 413 } … … 430 430 if (isSurrogate()) { 431 431 surrogatePropertyInheritance.put(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR, false); 432 Item classic = getClassic();432 Item primary = getPrimary(); 433 433 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR)) { 434 classic.classicPropertyEncryption.put(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave);434 primary.primaryPropertyEncryption.put(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave); 435 435 } 436 436 } … … 451 451 public Integer getWidth() { 452 452 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.WIDTH_TO_SAVE_STR)) { 453 return this.get Classic().getWidth();453 return this.getPrimary().getWidth(); 454 454 } else { 455 455 return _width; … … 467 467 public Integer getMinWidth() { 468 468 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.MIN_WIDTH_TO_SAVE_STR)) { 469 return this.get Classic().getMinWidth();469 return this.getPrimary().getMinWidth(); 470 470 } else { 471 471 return _minWidth; … … 483 483 public Colour getHighlightColor() { 484 484 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.HIGHLIGHT_STR)) { 485 return this.get Classic().getHighlightColor();485 return this.getPrimary().getHighlightColor(); 486 486 } else { 487 487 return _highlightColour; … … 511 511 if (isSurrogate()) { 512 512 surrogatePropertyInheritance.put(DefaultFrameWriter.JUSTIFICATION_STR, false); 513 Item classic = getClassic();513 Item primary = getPrimary(); 514 514 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.JUSTIFICATION_STR)) { 515 classic.classicPropertyEncryption.put(DefaultFrameWriter.JUSTIFICATION_STR, EncryptionDetail.InheritanceCheckOnSave);515 primary.primaryPropertyEncryption.put(DefaultFrameWriter.JUSTIFICATION_STR, EncryptionDetail.InheritanceCheckOnSave); 516 516 } 517 517 } … … 528 528 public Justification getJustification() { 529 529 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.JUSTIFICATION_STR)) { 530 return ((Text) this.get Classic()).getJustification();530 return ((Text) this.getPrimary()).getJustification(); 531 531 } else { 532 532 if (_justification == null || _justification.equals(Justification.left)) { … … 692 692 if (isSurrogate()) { 693 693 surrogatePropertyInheritance.put(DefaultFrameWriter.TEXT_STR, false); 694 Item classic = getClassic();694 Item primary = getPrimary(); 695 695 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.TEXT_STR)) { 696 classic.classicPropertyEncryption.put(DefaultFrameWriter.TEXT_STR, EncryptionDetail.InheritanceCheckOnSave);696 primary.primaryPropertyEncryption.put(DefaultFrameWriter.TEXT_STR, EncryptionDetail.InheritanceCheckOnSave); 697 697 } 698 698 } … … 1330 1330 if (isSurrogate()) { 1331 1331 surrogatePropertyInheritance.put(DefaultFrameWriter.FONT_STR, false); 1332 Item classic = getClassic();1332 Item primary = getPrimary(); 1333 1333 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.FONT_STR)) { 1334 classic.classicPropertyEncryption.put(DefaultFrameWriter.FONT_STR, EncryptionDetail.InheritanceCheckOnSave);1334 primary.primaryPropertyEncryption.put(DefaultFrameWriter.FONT_STR, EncryptionDetail.InheritanceCheckOnSave); 1335 1335 } 1336 1336 } … … 1344 1344 public Font getFont() { 1345 1345 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.FONT_STR)) { 1346 return ((Text) this.get Classic()).getFont();1346 return ((Text) this.getPrimary()).getFont(); 1347 1347 } else { 1348 1348 return _font; … … 1508 1508 public String getText() { 1509 1509 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.TEXT_STR)) { 1510 return this.get Classic().getText();1510 return this.getPrimary().getText(); 1511 1511 } else { 1512 1512 return _text.toString(); … … 1552 1552 if (isSurrogate()) { 1553 1553 surrogatePropertyInheritance.put(DefaultFrameWriter.SPACING_STR, false); 1554 Item classic = getClassic();1554 Item primary = getPrimary(); 1555 1555 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.SPACING_STR)) { 1556 classic.classicPropertyEncryption.put(DefaultFrameWriter.SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);1556 primary.primaryPropertyEncryption.put(DefaultFrameWriter.SPACING_STR, EncryptionDetail.InheritanceCheckOnSave); 1557 1557 } 1558 1558 } … … 1566 1566 public float getSpacing() { 1567 1567 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.SPACING_STR)) { 1568 return ((Text) this.get Classic()).getSpacing();1568 return ((Text) this.getPrimary()).getSpacing(); 1569 1569 } else { 1570 1570 return _spacing; … … 1593 1593 if (isSurrogate()) { 1594 1594 surrogatePropertyInheritance.put(DefaultFrameWriter.WORD_SPACING_STR, false); 1595 Item classic = getClassic();1595 Item primary = getPrimary(); 1596 1596 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.WORD_SPACING_STR)) { 1597 classic.classicPropertyEncryption.put(DefaultFrameWriter.WORD_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);1597 primary.primaryPropertyEncryption.put(DefaultFrameWriter.WORD_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave); 1598 1598 } 1599 1599 } … … 1602 1602 public int getWordSpacing() { 1603 1603 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.WORD_SPACING_STR)) { 1604 return ((Text) this.get Classic()).getWordSpacing();1604 return ((Text) this.getPrimary()).getWordSpacing(); 1605 1605 } else { 1606 1606 return _word_spacing; … … 1624 1624 if (isSurrogate()) { 1625 1625 surrogatePropertyInheritance.put(DefaultFrameWriter.LETTER_SPACING_STR, false); 1626 Item classic = getClassic();1626 Item primary = getPrimary(); 1627 1627 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.LETTER_SPACING_STR)) { 1628 classic.classicPropertyEncryption.put(DefaultFrameWriter.LETTER_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);1628 primary.primaryPropertyEncryption.put(DefaultFrameWriter.LETTER_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave); 1629 1629 } 1630 1630 } … … 1637 1637 public float getLetterSpacing() { 1638 1638 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.LETTER_SPACING_STR)) { 1639 return ((Text) this.get Classic()).getLetterSpacing();1639 return ((Text) this.getPrimary()).getLetterSpacing(); 1640 1640 } else { 1641 1641 return _letter_spacing; … … 1648 1648 if (isSurrogate()) { 1649 1649 surrogatePropertyInheritance.put(DefaultFrameWriter.INITIAL_SPACING_STR, false); 1650 Item classic = getClassic();1650 Item primary = getPrimary(); 1651 1651 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.INITIAL_SPACING_STR)) { 1652 classic.classicPropertyEncryption.put(DefaultFrameWriter.INITIAL_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave);1652 primary.primaryPropertyEncryption.put(DefaultFrameWriter.INITIAL_SPACING_STR, EncryptionDetail.InheritanceCheckOnSave); 1653 1653 } 1654 1654 } … … 1657 1657 public float getInitialSpacing() { 1658 1658 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.INITIAL_SPACING_STR)) { 1659 return ((Text) this.get Classic()).getInitialSpacing();1659 return ((Text) this.getPrimary()).getInitialSpacing(); 1660 1660 } else { 1661 1661 return _initial_spacing; … … 2864 2864 if (isSurrogate()) { 2865 2865 surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_LEFT_STR, false); 2866 Item classic = getClassic();2866 Item primary = getPrimary(); 2867 2867 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_LEFT_STR)) { 2868 classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_LEFT_STR, EncryptionDetail.InheritanceCheckOnSave);2868 primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_LEFT_STR, EncryptionDetail.InheritanceCheckOnSave); 2869 2869 } 2870 2870 } … … 2898 2898 if (isSurrogate()) { 2899 2899 surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_RIGHT_STR, false); 2900 Item classic = getClassic();2900 Item primary = getPrimary(); 2901 2901 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_RIGHT_STR)) { 2902 classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_RIGHT_STR, EncryptionDetail.InheritanceCheckOnSave);2902 primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_RIGHT_STR, EncryptionDetail.InheritanceCheckOnSave); 2903 2903 } 2904 2904 } … … 2939 2939 if (isSurrogate()) { 2940 2940 surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_TOP_STR, false); 2941 Item classic = getClassic();2941 Item primary = getPrimary(); 2942 2942 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_TOP_STR)) { 2943 classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_TOP_STR, EncryptionDetail.InheritanceCheckOnSave);2943 primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_TOP_STR, EncryptionDetail.InheritanceCheckOnSave); 2944 2944 } 2945 2945 } … … 2985 2985 if (isSurrogate()) { 2986 2986 surrogatePropertyInheritance.put(DefaultFrameWriter.ANCHOR_BOTTOM_STR, false); 2987 Item classic = getClassic();2987 Item primary = getPrimary(); 2988 2988 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.ANCHOR_BOTTOM_STR)) { 2989 classic.classicPropertyEncryption.put(DefaultFrameWriter.ANCHOR_BOTTOM_STR, EncryptionDetail.InheritanceCheckOnSave);2989 primary.primaryPropertyEncryption.put(DefaultFrameWriter.ANCHOR_BOTTOM_STR, EncryptionDetail.InheritanceCheckOnSave); 2990 2990 } 2991 2991 } … … 3146 3146 public boolean getAutoWrap() { 3147 3147 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR)) { 3148 return ((Text) this.get Classic()).getAutoWrap();3148 return ((Text) this.getPrimary()).getAutoWrap(); 3149 3149 } else { 3150 3150 return _autoWrap; … … 3166 3166 if (isSurrogate()) { 3167 3167 surrogatePropertyInheritance.put(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR, false); 3168 Item classic = getClassic();3168 Item primary = getPrimary(); 3169 3169 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR)) { 3170 classic.classicPropertyEncryption.put(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave);3170 primary.primaryPropertyEncryption.put(DefaultFrameWriter.AUTO_WRAP_TO_SAVE_STR, EncryptionDetail.InheritanceCheckOnSave); 3171 3171 } 3172 3172 } … … 3294 3294 public Integer getMask() { 3295 3295 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.MASK_STR)) { 3296 return ((Text) this.get Classic()).getMask();3296 return ((Text) this.getPrimary()).getMask(); 3297 3297 } else { 3298 3298 return _mask; … … 3305 3305 if (isSurrogate()) { 3306 3306 surrogatePropertyInheritance.put(DefaultFrameWriter.MASK_STR, false); 3307 Item classic = getClassic();3307 Item primary = getPrimary(); 3308 3308 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.MASK_STR)) { 3309 classic.classicPropertyEncryption.put(DefaultFrameWriter.MASK_STR, EncryptionDetail.InheritanceCheckOnSave);3309 primary.primaryPropertyEncryption.put(DefaultFrameWriter.MASK_STR, EncryptionDetail.InheritanceCheckOnSave); 3310 3310 } 3311 3311 } … … 3314 3314 public String getPlaceholder() { 3315 3315 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.PLACEHOLDER_STR)) { 3316 return ((Text) this.get Classic()).getPlaceholder();3316 return ((Text) this.getPrimary()).getPlaceholder(); 3317 3317 } else { 3318 3318 if (_placeholder == null || _placeholder.length() == 0) { … … 3328 3328 if (isSurrogate()) { 3329 3329 surrogatePropertyInheritance.put(DefaultFrameWriter.PLACEHOLDER_STR, false); 3330 Item classic = getClassic();3330 Item primary = getPrimary(); 3331 3331 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.PLACEHOLDER_STR)) { 3332 classic.classicPropertyEncryption.put(DefaultFrameWriter.PLACEHOLDER_STR, EncryptionDetail.InheritanceCheckOnSave);3332 primary.primaryPropertyEncryption.put(DefaultFrameWriter.PLACEHOLDER_STR, EncryptionDetail.InheritanceCheckOnSave); 3333 3333 } 3334 3334 } … … 3347 3347 public boolean isSingleLineOnly() { 3348 3348 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.SINGLE_LINE_ONLY_STR)) { 3349 return ((Text) this.get Classic()).isSingleLineOnly();3349 return ((Text) this.getPrimary()).isSingleLineOnly(); 3350 3350 } else { 3351 3351 return _singleLine; … … 3358 3358 if (isSurrogate()) { 3359 3359 surrogatePropertyInheritance.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, false); 3360 Item classic = getClassic();3360 Item primary = getPrimary(); 3361 3361 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.SINGLE_LINE_ONLY_STR)) { 3362 classic.classicPropertyEncryption.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, EncryptionDetail.InheritanceCheckOnSave);3362 primary.primaryPropertyEncryption.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, EncryptionDetail.InheritanceCheckOnSave); 3363 3363 } 3364 3364 } … … 3367 3367 public int getTabIndex() { 3368 3368 if (isSurrogate() && surrogatePropertyInheritance.get(DefaultFrameWriter.TAB_INDEX_STR)) { 3369 return ((Text) this.get Classic()).getTabIndex();3369 return ((Text) this.getPrimary()).getTabIndex(); 3370 3370 } else { 3371 3371 return this._tabIndex; … … 3378 3378 if (isSurrogate()) { 3379 3379 surrogatePropertyInheritance.put(DefaultFrameWriter.TAB_INDEX_STR, false); 3380 Item classic = getClassic();3380 Item primary = getPrimary(); 3381 3381 if (subjectToInheritanceCheckOnSave(DefaultFrameWriter.TAB_INDEX_STR)) { 3382 classic.classicPropertyEncryption.put(DefaultFrameWriter.TAB_INDEX_STR, EncryptionDetail.InheritanceCheckOnSave);3382 primary.primaryPropertyEncryption.put(DefaultFrameWriter.TAB_INDEX_STR, EncryptionDetail.InheritanceCheckOnSave); 3383 3383 } 3384 3384 }
Note:
See TracChangeset
for help on using the changeset viewer.