You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ac...@apache.org on 2008/07/21 17:35:26 UTC
svn commit: r678450 - in
/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp:
AFPRenderer.java AFPSVGHandler.java DataObjectCache.java
modca/AFPDataStream.java modca/DataObjectFactory.java modca/Registry.java
Author: acumiskey
Date: Mon Jul 21 08:35:26 2008
New Revision: 678450
URL: http://svn.apache.org/viewvc?rev=678450&view=rev
Log:
Removed arbitrary image formats from MO:DCA registry.
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java?rev=678450&r1=678449&r2=678450&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java Mon Jul 21 08:35:26 2008
@@ -635,12 +635,16 @@
(float)posInt.getHeight()
};
int[] coords = mpts2units(srcPts);
- String mimeType = info.getMimeType();
+
// create image object parameters
ImageObjectInfo imageObjectInfo = new ImageObjectInfo();
imageObjectInfo.setBuffered(false);
imageObjectInfo.setUri(uri);
- imageObjectInfo.setMimeType(mimeType);
+
+ String mimeType = info.getMimeType();
+ if (mimeType != null) {
+ imageObjectInfo.setMimeType(mimeType);
+ }
ObjectAreaInfo objectAreaInfo = new ObjectAreaInfo();
objectAreaInfo.setX(coords[X]);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPSVGHandler.java?rev=678450&r1=678449&r2=678450&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPSVGHandler.java Mon Jul 21 08:35:26 2008
@@ -221,7 +221,6 @@
/** {@inheritDoc} */
protected void updateRendererContext(RendererContext context) {
//Work around a problem in Batik: Gradients cannot be done in ColorSpace.CS_GRAY
- context.setProperty(AFPRendererContextConstants.AFP_GRAYSCALE,
- Boolean.FALSE);
+ context.setProperty(AFPRendererContextConstants.AFP_GRAYSCALE, Boolean.FALSE);
}
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java?rev=678450&r1=678449&r2=678450&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java Mon Jul 21 08:35:26 2008
@@ -155,9 +155,9 @@
* @return a cache record
*/
public Record store(DataObjectInfo dataObjectInfo) {
- Registry.ObjectType objectType = dataObjectInfo.getObjectType();
Record record = null;
- if (!objectType.canBeIncluded()) {
+ Registry.ObjectType objectType = dataObjectInfo.getObjectType();
+ if (objectType == null || !objectType.canBeIncluded()) {
AbstractNamedAFPObject dataObj = factory.createObject(dataObjectInfo);
if (dataObj == null) {
log.error("Failed to create object: " + dataObjectInfo);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java?rev=678450&r1=678449&r2=678450&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java Mon Jul 21 08:35:26 2008
@@ -263,7 +263,6 @@
String overlayName = "OVL"
+ StringUtils.lpad(String.valueOf(++overlayCount), '0', 5);
- DataObjectCache cache = DataObjectCache.getInstance();
DataObjectFactory factory = cache.getFactory();
this.currentOverlay = factory.createOverlay(
overlayName, width, height, widthRes, heightRes, overlayRotation);
@@ -446,9 +445,9 @@
if (objectType.canBeIncluded()) {
// Create and return include
- DataObjectFactory factory = cache.getFactory();
- IncludeObject includeObj = factory.createInclude(
- record.getObjectName(), dataObjectInfo);
+ DataObjectFactory factory = cache.getFactory();
+ String objectName = record.getObjectName();
+ IncludeObject includeObj = factory.createInclude(objectName, dataObjectInfo);
getCurrentPage().addObject(includeObj);
// Record the resource cache key (uri) in the ResourceGroup
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java?rev=678450&r1=678449&r2=678450&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java Mon Jul 21 08:35:26 2008
@@ -197,31 +197,20 @@
if (includeObj == null) {
includeObj = new IncludeObject(name);
- Registry.ObjectType objectType = dataObjectInfo.getObjectType();
- if (objectType.isImage()) {
+ if (dataObjectInfo instanceof ImageObjectInfo) {
includeObj.setDataObjectType(IncludeObject.TYPE_IMAGE);
- } else if (objectType.isGraphic()) {
+ } else if (dataObjectInfo instanceof GraphicsObjectInfo) {
includeObj.setDataObjectType(IncludeObject.TYPE_GRAPHIC);
- // } else if (dataObject instanceof PageSegment) {
- // includeObj.setDataObjectType(IncludeObject.TYPE_PAGE_SEGMENT);
} else {
includeObj.setDataObjectType(IncludeObject.TYPE_OTHER);
- // Strip any object container
- // AbstractNamedAFPObject dataObject = dataObjectAccessor.getDataObject();
- // if (dataObject instanceof ObjectContainer) {
- // ObjectContainer objectContainer = (ObjectContainer)dataObject;
- // dataObject = objectContainer.getDataObject();
- // }
}
-// includeObj.setFullyQualifiedName(
-// FullyQualifiedNameTriplet.TYPE_REPLACE_FIRST_GID_NAME,
-// FullyQualifiedNameTriplet.FORMAT_CHARSTR,
-// dataObjectInfo.getUri());
-
- includeObj.setObjectClassification(
- ObjectClassificationTriplet.CLASS_TIME_INVARIANT_PAGINATED_PRESENTATION_OBJECT,
- objectType);
+ Registry.ObjectType objectType = dataObjectInfo.getObjectType();
+ if (objectType != null) {
+ includeObj.setObjectClassification(
+ ObjectClassificationTriplet.CLASS_TIME_INVARIANT_PAGINATED_PRESENTATION_OBJECT,
+ objectType);
+ }
ObjectAreaInfo objectAreaInfo = dataObjectInfo.getObjectAreaInfo();
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java?rev=678450&r1=678449&r2=678450&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java Mon Jul 21 08:35:26 2008
@@ -24,16 +24,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.render.afp.DataObjectInfo;
-import org.apache.fop.render.afp.ImageObjectInfo;
import org.apache.xmlgraphics.util.MimeConstants;
/**
* MOD:CA Registry of object types
*/
public final class Registry {
- /** logging instance */
- private static final Log log = LogFactory.getLog("org.apache.fop.afp");
-
/** IOB supported object types */
private static final byte COMPID_GIF = 22;
private static final byte COMPID_JFIF = 23; // jpeg file interchange format
@@ -127,35 +123,23 @@
true,
MimeConstants.MIME_PCL
)
- );
-
- // Entries without component and object ids
- mimeObjectTypeMap.put(
- MimeConstants.MIME_SVG,
- new ObjectType(
- "Scaleable Vector Graphics",
- MimeConstants.MIME_SVG
- )
- );
- mimeObjectTypeMap.put(
- MimeConstants.MIME_PNG,
- new ObjectType(
- "Portable Network Graphics",
- MimeConstants.MIME_PNG
- )
- );
+ );
}
/**
* Returns the Registry ObjectType for a given data object info
+ * or null if not registered
*
* @param dataObjectInfo the data object info
* @return the Registry ObjectType for a given data object info
+ * or null if not registered
*/
public Registry.ObjectType getObjectType(DataObjectInfo dataObjectInfo) {
String mimeType = dataObjectInfo.getMimeType();
- ObjectType objectType = (Registry.ObjectType)mimeObjectTypeMap.get(mimeType);
- return objectType;
+ if (mimeType != null) {
+ return (Registry.ObjectType)mimeObjectTypeMap.get(mimeType);
+ }
+ return null;
}
/**
@@ -169,29 +153,6 @@
private String mimeType;
/**
- * Constructor
- *
- * @param name the object type name
- * @param canBeIncluded true if this object can be included with an IOB structured field
- * @param mimeType the mime type associated with this object type
- */
- private ObjectType(String name, boolean canBeIncluded, String mimeType) {
- this.name = name;
- this.canBeIncluded = canBeIncluded;
- this.mimeType = mimeType;
- }
-
- /**
- * Constructor
- *
- * @param name the object type name
- * @param mimeType the mime type associated with this object type
- */
- private ObjectType(String name, String mimeType) {
- this(name, false, mimeType);
- }
-
- /**
* Main constructor
*
* @param componentId the component id of this object type
@@ -202,7 +163,9 @@
*/
public ObjectType(byte componentId, byte[] oid, String name,
boolean canBeIncluded, String mimeType) {
- this(name, canBeIncluded, mimeType);
+ this.name = name;
+ this.canBeIncluded = canBeIncluded;
+ this.mimeType = mimeType;
this.componentId = componentId;
this.oid = oid;
}
@@ -261,7 +224,6 @@
public boolean isImage() {
return mimeType == MimeConstants.MIME_TIFF
|| mimeType == MimeConstants.MIME_GIF
- || mimeType == MimeConstants.MIME_PNG
|| mimeType == MimeConstants.MIME_JPEG;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org