xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adelme...@apache.org
Subject svn commit: r556244 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline: LineLayoutManager.java TextLayoutManager.java
Date Sat, 14 Jul 2007 08:48:05 GMT
Author: adelmelle
Date: Sat Jul 14 01:48:04 2007
New Revision: 556244

URL: http://svn.apache.org/viewvc?view=rev&rev=556244
Log:
Some cleanup and removal of unused methods

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?view=diff&rev=556244&r1=556243&r2=556244
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Sat Jul 14 01:48:04 2007
@@ -217,7 +217,7 @@
         // the LM which created the paragraph
         private LineLayoutManager layoutManager;
 
-        public Paragraph(LineLayoutManager llm, int alignment, int alignmentLast,
+        Paragraph(LineLayoutManager llm, int alignment, int alignmentLast,
                          int indent, int endIndent) {
             super();
             layoutManager = llm;
@@ -227,10 +227,6 @@
             lastLineEndIndent = endIndent;
         }
 
-        public void startParagraph() {
-            startSequence();
-        }
-
         public void startSequence() {
             // set the minimum amount of empty space at the end of the
             // last line
@@ -715,7 +711,7 @@
                                                 textAlignment, textAlignmentLast, 
                                                 textIndent.getValue(this),
                                                 lastLineEndIndent.getValue(this));
-                        lastPar.startParagraph();
+                        lastPar.startSequence();
                         if (log.isTraceEnabled()) {
                             trace.append(" [");
                         }

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?view=diff&rev=556244&r1=556243&r2=556244
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
Sat Jul 14 01:48:04 2007
@@ -30,7 +30,6 @@
 import org.apache.fop.area.inline.TextArea;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FOText;
-import org.apache.fop.fo.flow.Inline;
 import org.apache.fop.fonts.Font;
 import org.apache.fop.layoutmgr.InlineKnuthSequence;
 import org.apache.fop.layoutmgr.KnuthBox;
@@ -215,10 +214,6 @@
         letterSpaceIPD = ls.getSpace();
         wordSpaceIPD = MinOptMax.add(new MinOptMax(spaceCharIPD), ws.getSpace());
 
-        // if the text node is son of an inline, set vertical align
-        if (foText.getParent() instanceof Inline) {
-            Inline fobj = (Inline)foText.getParent();
-        }
     }
 
     /**
@@ -547,10 +542,6 @@
             || CharUtilities.isFixedWidthSpace(ch);
     }
     
-    private static boolean isBreakChar(final char ch) {
-        return (BREAK_CHARS.indexOf(ch) >= 0);
-    }
-    
     /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int)
*/
     public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
         lineStartBAP = context.getLineStartBorderAndPaddingWidth();
@@ -689,7 +680,9 @@
                 }
             }
             
-            if (ch == CharUtilities.SPACE && foText.getWhitespaceTreatment() == Constants.EN_PRESERVE
|| ch == CharUtilities.NBSPACE) {
+            if ((ch == CharUtilities.SPACE 
+                    && foText.getWhitespaceTreatment() == Constants.EN_PRESERVE)

+                    || ch == CharUtilities.NBSPACE) {
                 // preserved space or non-breaking space:
                 // create the AreaInfo object
                 ai = new AreaInfo(iNextStart, (short) (iNextStart + 1),



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message