Removed commented out code.

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

diff --git a/src/java/org/apache/fop/render/afp/modca/IncludeObject.java b/src/java/org/apache/fop/render/afp/modca/IncludeObject.java
index 807d66421f68a51268931f77c92fca65bab5f1e9..de3efd9776443821a295368d5b8aacdb307ec4b0 100644 (file)
--- a/src/java/org/apache/fop/render/afp/modca/IncludeObject.java
+++ b/src/java/org/apache/fop/render/afp/modca/IncludeObject.java
@@ -93,11 +93,6 @@ public class IncludeObject extends AbstractNamedAFPObject {
      * The Y-axis origin defined in the object
      */
     private int yContentOffset = 0;
-
-//    /**
-//     * the referenced data object
-//     */
-//    private DataObjectAccessor dataObjectAccessor = null;
     
     /**
      * Constructor for the include object with the specified name, the name must
@@ -105,72 +100,11 @@ public class IncludeObject extends AbstractNamedAFPObject {
      * object.
      *
      * @param name the name of this include object
-     * @param dataObjectAccessor the data object accessor
      */
-    public IncludeObject(String name/*, DataObjectAccessor dataObjectAccessor*/) {
+    public IncludeObject(String name) {
         super(name);
-
-//        this.dataObjectAccessor = dataObjectAccessor;
-        
-//        AbstractNamedAFPObject dataObject = dataObjectAccessor.getDataObject();
-//        if (dataObject instanceof ImageObject) {
-//            this.dataObjectType = TYPE_IMAGE;
-//        } else if (dataObject instanceof GraphicsObject) {
-//            this.dataObjectType = TYPE_GRAPHIC;
-//        } else if (dataObject instanceof PageSegment) {
-//            this.dataObjectType = TYPE_PAGE_SEGMENT;
-//        } else {
-//            this.dataObjectType = TYPE_OTHER;
-//            // Strip any object container
-//            if (dataObject instanceof ObjectContainer) {
-//                ObjectContainer objectContainer = (ObjectContainer)dataObject;
-//                dataObject = objectContainer.getDataObject();
-//            }
-//        }
-
-//        DataObjectInfo dataObjectInfo = dataObjectAccessor.getDataObjectInfo();
-//        ObjectAreaInfo objectAreaInfo = dataObjectInfo.getObjectAreaInfo();
-//        setObjectArea(objectAreaInfo.getX(), objectAreaInfo.getY());
-//        
-//        super.setFullyQualifiedName(
-//                FullyQualifiedNameTriplet.TYPE_REPLACE_FIRST_GID_NAME,
-//                FullyQualifiedNameTriplet.FORMAT_CHARSTR,
-//                dataObjectInfo.getUri());
-//
-//        Registry registry = Registry.getInstance();
-//        Registry.ObjectType objectType = registry.getObjectType(dataObjectInfo);
-//        super.setObjectClassification(
-//             ObjectClassificationTriplet.CLASS_TIME_INVARIANT_PAGINATED_PRESENTATION_OBJECT,
-//             objectType);
-//        
-//        super.setMeasurementUnits(objectAreaInfo.getWidthRes(), objectAreaInfo.getHeightRes());
-//        
-//        super.setMappingOption(MappingOptionTriplet.SCALE_TO_FIT);
-//        
-//        super.setObjectAreaSize(objectAreaInfo.getWidth(), objectAreaInfo.getHeight());        
     }
 
-//    /**
-//     * {@inheritDoc}
-//     */
-//    public AbstractNamedAFPObject getDataObject() {
-//        return dataObjectAccessor.getDataObject();
-//    }
-//    
-//    /**
-//     * {@inheritDoc}
-//     */
-//    public DataObjectInfo getDataObjectInfo() {
-//        return dataObjectAccessor.getDataObjectInfo();
-//    }
-//
-//    /**
-//     * {@inheritDoc}
-//     */
-//    public void setDataObjectInfo(DataObjectInfo dataObjectInfo) {
-//        dataObjectAccessor.setDataObjectInfo(dataObjectInfo);
-//    }
-
     /**
      * Sets the orientation to use for the Include Object.
      *