[FOray-commit] SF.net SVN: foray:[12594] trunk/foray/foray-content/src/main/java/org/ foray/content/TextContent4a.java

[<vic...@us...>]

Revision: 12594
          http://sourceforge.net/p/foray/code/12594
Author:   victormote
Date:     2022-02-14 12:21:57 +0000 (Mon, 14 Feb 2022)
Log Message:
-----------
Remove duplicate context variable.

Modified Paths:
--------------
    trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java

Modified: trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java
===================================================================
--- trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java	2022-02-13 12:18:24 UTC (rev 12593)
+++ trunk/foray/foray-content/src/main/java/org/foray/content/TextContent4a.java	2022-02-14 12:21:57 UTC (rev 12594)
@@ -46,9 +46,6 @@
  */
 public abstract class TextContent4a extends Content4a implements TextContent {
 
-    /** The FO context. */
-    private FoContext context = null;
-
     /**
      * Constructor.
      * @param context The FO context.
@@ -69,12 +66,12 @@
 
     @Override
     public FontUse inlinePrimaryFont() {
-        return effectiveParent().getPrimaryFont(this.context);
+        return effectiveParent().getPrimaryFont(getContext());
     }
 
     @Override
     public FontUse inlineSecondaryFont(final int codePoint) {
-        return effectiveParent().getSecondaryFont(this.context, codePoint);
+        return effectiveParent().getSecondaryFont(getContext(), codePoint);
     }
 
     @Override
@@ -85,17 +82,17 @@
 
     @Override
     public int inlineFontSize() {
-        return effectiveParent().traitFontSize(this.context);
+        return effectiveParent().traitFontSize(getContext());
     }
 
     @Override
     public int inlineLetterSpacingOptimum() {
-        return effectiveParent().traitLetterSpacingOpt(this.context);
+        return effectiveParent().traitLetterSpacingOpt(getContext());
     }
 
     @Override
     public int inlineWordSpacingOptimum() {
-        return effectiveParent().traitWordSpacingOpt(this.context);
+        return effectiveParent().traitWordSpacingOpt(getContext());
     }
 
     @Override
@@ -104,7 +101,7 @@
         final Fo effectiveParent = getContent().getParent();
         if (effectiveParent instanceof WrapOptionPa) {
             final WrapOptionPa wrapOption = (WrapOptionPa) effectiveParent;
-            return wrapOption.traitWrapOption(this.context) == WrapOption.WRAP;
+            return wrapOption.traitWrapOption(getContext()) == WrapOption.WRAP;
         }
         /* The initial value. */
         return true;
@@ -112,27 +109,27 @@
 
     @Override
     public boolean inlineHyphenate() {
-        return effectiveParent().traitHyphenate(this.context);
+        return effectiveParent().traitHyphenate(getContext());
     }
 
     @Override
     public int inlineHyphenationRemainCount() {
-        return effectiveParent().traitHyphenationRemainCharacterCount(this.context);
+        return effectiveParent().traitHyphenationRemainCharacterCount(getContext());
     }
 
     @Override
     public int inlineHyphenationPushCount() {
-        return effectiveParent().traitHyphenationPushCharacterCount(this.context);
+        return effectiveParent().traitHyphenationPushCharacterCount(getContext());
     }
 
     @Override
     public int inlineHyphenationCharacter() {
-        return effectiveParent().traitHyphenationCharacter(this.context);
+        return effectiveParent().traitHyphenationCharacter(getContext());
     }
 
     @Override
     public boolean inlineIsFauxSmallCaps() {
-        if (effectiveParent().traitFontVariant(context) != Font.Variant.SMALL_CAPS) {
+        if (effectiveParent().traitFontVariant(getContext()) != Font.Variant.SMALL_CAPS) {
             /* If we are not doing small-caps at all, we certainly should not be simulating it. */
             return false;
         }
@@ -142,7 +139,7 @@
          * Right now we rely on the user to configure the font correctly to avoid this. */
 
         /* Has the font been configured to simulate small-caps? */
-        final FontUse fontUse = effectiveParent().getPrimaryFont(context);
+        final FontUse fontUse = effectiveParent().getPrimaryFont(getContext());
         if (fontUse.simulateSmallCaps() == FontServer.SMALL_CAP_SIMULATION_INVALID) {
             return false;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.