Remove commented code.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@605978 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java
index ecdbd68e4718ecd3caeb8dfef13bddeaeb88dc09..ab05d60c39650338c7fb711cdfb8c62a3729f7a6 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java
@@ -19,7 +19,6 @@
 
 package org.apache.fop.layoutmgr.inline;
 
-import java.awt.geom.Rectangle2D;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.inline.Image;
 import org.apache.fop.fo.flow.ExternalGraphic;
@@ -34,7 +33,6 @@ public class ExternalGraphicLayoutManager extends AbstractGraphicsLayoutManager
 
     /**
      * Constructor
-     *
      * @param node the fo:external-graphic formatting object that creates the area
      */
     public ExternalGraphicLayoutManager(ExternalGraphic node) {
@@ -42,165 +40,7 @@ public class ExternalGraphicLayoutManager extends AbstractGraphicsLayoutManager
         fobj = node;
     }
 
-    /**
-     * Setup this image.
-     * This gets the sizes for the image and the dimensions and clipping.
-     * @todo see if can simplify property handling logic
-     */
-    /*
-    private void setup() {
-        // assume lr-tb for now and just use the .optimum value of the range
-        Length ipd = fobj.getInlineProgressionDimension().getOptimum(this).getLength();
-        if (ipd.getEnum() != EN_AUTO) {
-            viewWidth = ipd.getValue(this);
-        } else {
-            ipd = fobj.getWidth();
-            if (ipd.getEnum() != EN_AUTO) {
-                viewWidth = ipd.getValue(this);
-            }
-        }
-        Length bpd = fobj.getBlockProgressionDimension().getOptimum(this).getLength();
-        if (bpd.getEnum() != EN_AUTO) {
-            viewHeight = bpd.getValue(this);
-        } else {
-            bpd = fobj.getHeight();
-            if (bpd.getEnum() != EN_AUTO) {
-                viewHeight = bpd.getValue(this);
-            }
-        }
-
-        int cwidth = -1;
-        int cheight = -1;
-        Length ch = fobj.getContentHeight();
-        if (ch.getEnum() != EN_AUTO) {
-            if (ch.getEnum() == EN_SCALE_TO_FIT) {
-                if (viewHeight != -1) {
-                    cheight = viewHeight;
-                }
-            } else {
-                cheight = ch.getValue(this);
-            }
-        }
-        Length cw = fobj.getContentWidth();
-        if (cw.getEnum() != EN_AUTO) {
-            if (cw.getEnum() == EN_SCALE_TO_FIT) {
-                if (viewWidth != -1) {
-                    cwidth = viewWidth;
-                }
-            } else {
-                cwidth = cw.getValue(this);
-            }
-        }
-
-        int scaling = fobj.getScaling();
-        if ((scaling == EN_UNIFORM) || (cwidth == -1) || cheight == -1) {
-            if (cwidth == -1 && cheight == -1) {
-                cwidth = fobj.getIntrinsicWidth();
-                cheight = fobj.getIntrinsicHeight();
-            } else if (cwidth == -1) {
-                cwidth = (int)(fobj.getIntrinsicWidth() * (double)cheight 
-                    / fobj.getIntrinsicHeight());
-            } else if (cheight == -1) {
-                cheight = (int)(fobj.getIntrinsicHeight() * (double)cwidth 
-                    / fobj.getIntrinsicWidth());
-            } else {
-                // adjust the larger
-                double rat1 = (double)cwidth / fobj.getIntrinsicWidth();
-                double rat2 = (double)cheight / fobj.getIntrinsicHeight();
-                if (rat1 < rat2) {
-                    // reduce cheight
-                    cheight = (int)(rat1 * fobj.getIntrinsicHeight());
-                } else if (rat1 > rat2) {
-                    cwidth = (int)(rat2 * fobj.getIntrinsicWidth());
-                }
-            }
-        }
-
-        if (viewWidth == -1) {
-            viewWidth = cwidth;
-        }
-        if (viewHeight == -1) {
-            viewHeight = cheight;
-        }
-
-        if (cwidth > viewWidth || cheight > viewHeight) {
-            int overflow = fobj.getOverflow();
-            if (overflow == EN_HIDDEN) {
-                clip = true;
-            } else if (overflow == EN_ERROR_IF_OVERFLOW) {
-                fobj.getLogger().error("Image: " + fobj.getURL()
-                                  + " overflows the viewport, clipping to viewport");
-                clip = true;
-            }
-        }
-
-        int xoffset = 0;
-        int yoffset = 0;
-        switch(fobj.getDisplayAlign()) {
-            case EN_BEFORE:
-            break;
-            case EN_AFTER:
-                yoffset = viewHeight - cheight;
-            break;
-            case EN_CENTER:
-                yoffset = (viewHeight - cheight) / 2;
-            break;
-            case EN_AUTO:
-            default:
-            break;
-        }
-
-        switch(fobj.getTextAlign()) {
-            case EN_CENTER:
-                xoffset = (viewWidth - cwidth) / 2;
-            break;
-            case EN_END:
-                xoffset = viewWidth - cwidth;
-            break;
-            case EN_START:
-            break;
-            case EN_JUSTIFY:
-            default:
-            break;
-        }
-        
-        
-        CommonBorderPaddingBackground borderProps = fobj.getCommonBorderPaddingBackground();
-        
-        //Determine extra BPD from borders etc.
-        int beforeBPD = borderProps.getPadding(CommonBorderPaddingBackground.BEFORE, false, this);
-        beforeBPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.BEFORE,
-                                             false);
-        int afterBPD = borderProps.getPadding(CommonBorderPaddingBackground.AFTER, false, this);
-        afterBPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.AFTER, false);
-        
-        yoffset += beforeBPD;
-        viewBPD = viewHeight;
-        viewHeight += beforeBPD;
-        viewHeight += afterBPD;
-        
-        //Determine extra IPD from borders etc.
-        int startIPD = borderProps.getPadding(CommonBorderPaddingBackground.START,
-                false, this);
-        startIPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.START,
-                 false);
-        int endIPD = borderProps.getPadding(CommonBorderPaddingBackground.END, false, this);
-        endIPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.END, false);
-        
-        xoffset += startIPD;
-        viewIPD = viewWidth;
-        viewWidth += startIPD;
-        viewWidth += endIPD;
-        
-        placement = new Rectangle2D.Float(xoffset, yoffset, cwidth, cheight);
-    }
-    */
-    
-    /**
-     * Get the inline area created by this element.
-     *
-     * @return the inline area
-     */
+    /** {@inheritDoc} */
     protected Area getChildArea() {
         return new Image(fobj.getSrc());
     }

diff --git a/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java b/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java
index 8ff6b346e46d3e1e3f6a469e56e510cf15be6b30..e7da50a9a387a8b2d91b01f18c9d9a16d0cb64c0 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java
@@ -40,11 +40,7 @@ public class InstreamForeignObjectLM extends AbstractGraphicsLayoutManager {
         fobj = node;
     }
 
-    /**
-     * Get the inline area created by this element.
-     *
-     * @return the inline area
-     */
+    /** {@inheritDoc} */
     protected Area getChildArea() {
         XMLObj child = (XMLObj) fobj.getChildXMLObj();