[FOray-commit] SF.net SVN: foray: [7429] trunk/foray/foray-areatree/src/java/org/foray/area

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

Revision: 7429
Author:   victormote
Date:     2006-06-06 12:35:12 -0700 (Tue, 06 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7429&view=rev

Log Message:
-----------
Simplify TextArea construction a bit.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-06 19:10:00 UTC (rev 7428)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java	2006-06-06 19:35:12 UTC (rev 7429)
@@ -832,15 +832,13 @@
         if (parent instanceof FObjMixed) {
             FObjMixed mixed = (FObjMixed) foText.parentFO();
             int sequence = mixed.getChildren().indexOf(foText);
-            int initialWordSpacing = parentArea.traitWordSpacingOpt();
-            int initialLetterSpacing = parentArea.traitLetterSpacingOpt();
             return new TextArea(mixed, parentArea, sequence,
-                    startOffset, sizeInChars, ipd, initialLetterSpacing,
-                    initialWordSpacing, hasDiscretionaryHyphen,
+                    startOffset, sizeInChars, ipd,
+                    hasDiscretionaryHyphen,
                     hasFauxSmallCaps);
         }
         if (parent instanceof Character) {
-            return new TextArea((Character) parent, parentArea, ipd, 0, 0,
+            return new TextArea((Character) parent, parentArea, ipd,
                     hasDiscretionaryHyphen, hasFauxSmallCaps);
         }
         return null;

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-06-06 19:10:00 UTC (rev 7428)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2006-06-06 19:35:12 UTC (rev 7429)
@@ -110,28 +110,26 @@
 
     public TextArea(FObjMixed generatedBy, Area parentArea,
             int backingSequence, int backingOffset, int backingSize,
-            int progressionDimensionUsed, int initialLetterSpacing,
-            int initialWordSpacing, boolean hasDiscretionaryHyphen,
+            int progressionDimensionUsed, boolean hasDiscretionaryHyphen,
             boolean hasFauxSmallCaps) {
         super(generatedBy, parentArea);
         this.backingSequence = backingSequence;
         this.backingOffset = backingOffset;
         this.backingSize = backingSize;
-        this.resolvedLetterSpacing = initialLetterSpacing;
-        this.resolvedWordSpacing = initialWordSpacing;
+        this.resolvedLetterSpacing = parentArea.traitLetterSpacingOpt();
+        this.resolvedWordSpacing = parentArea.traitWordSpacingOpt();
         this.hasDiscretionaryHyphen = hasDiscretionaryHyphen;
         this.hasFauxSmallCaps = hasFauxSmallCaps;
         setProgressionDimension(progressionDimensionUsed);
     }
 
     public TextArea(Character generatedBy, Area parentArea,
-            int progressionDimensionUsed, int resolvedLetterSpacing,
-            int resolvedWordSpacing, boolean hasDiscretionaryHyphen,
+            int progressionDimensionUsed, boolean hasDiscretionaryHyphen,
             boolean hasFauxSmallCaps) {
         super(generatedBy, parentArea);
         this.backingSize = 1;
-        this.resolvedLetterSpacing = resolvedLetterSpacing;
-        this.resolvedWordSpacing = resolvedWordSpacing;
+        this.resolvedLetterSpacing = 0;
+        this.resolvedWordSpacing = 0;
         this.hasDiscretionaryHyphen = hasDiscretionaryHyphen;
         this.hasFauxSmallCaps = hasFauxSmallCaps;
         setProgressionDimension(progressionDimensionUsed);


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