Author: vhennebert
Date: Tue Mar 24 10:46:59 2009
New Revision: 757712
URL: http://svn.apache.org/viewvc?rev=757712&view=rev
Log:
Simplified the setting of filters in the AbstractPDFStream hierarchy. Instead
of unnecessarily re-defining the setupFilterList method, sub-classes just
define a getDefaultFilterName method
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFFontStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFFontStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFFontStream.java?rev=757712&r1=757711&r2=757712&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFFontStream.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFFontStream.java
Tue Mar 24 10:46:59 2009
@@ -33,9 +33,8 @@
}
/** {...@inheritdoc} */
- protected void setupFilterList() {
- addDefaultFilter(PDFFilterList.FONT_FILTER);
- super.setupFilterList();
+ protected String getDefaultFilterName() {
+ return PDFFilterList.FONT_FILTER;
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java?rev=757712&r1=757711&r2=757712&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/AbstractPDFStream.java
Tue Mar 24 10:46:59 2009
@@ -47,21 +47,23 @@
* from outside.
*/
protected void setupFilterList() {
- addDefaultFilter(PDFFilterList.DEFAULT_FILTER);
+ if (!getFilterList().isInitialized()) {
+ getFilterList().addDefaultFilters(
+ getDocumentSafely().getFilterMap(),
+ getDefaultFilterName());
+ }
prepareImplicitFilters();
getDocument().applyEncryption(this);
}
/**
- * Adds the default filter to the filter list if the filter list hasn't
been initialized, yet.
- * @param filterName the name of the default filter to use
+ * Returns the name of a suitable filter for this PDF object.
+ *
+ * @return the default filter
+ * @see PDFFilterList
*/
- protected void addDefaultFilter(String filterName) {
- if (!getFilterList().isInitialized()) {
- getFilterList().addDefaultFilters(
- getDocumentSafely().getFilterMap(),
- filterName);
- }
+ protected String getDefaultFilterName() {
+ return PDFFilterList.DEFAULT_FILTER;
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java?rev=757712&r1=757711&r2=757712&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java Tue
Mar 24 10:46:59 2009
@@ -159,14 +159,11 @@
}
/**
- * This sets up the default filters for XObjects. It uses the PDFImage
- * instance to determine what default filters to apply.
* {...@inheritdoc}
+ * This class uses the PDFImage instance to determine the default filter.
*/
- protected void setupFilterList() {
- addDefaultFilter(pdfimage.getFilterHint());
- super.setupFilterList();
+ protected String getDefaultFilterName() {
+ return pdfimage.getFilterHint();
}
-
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java?rev=757712&r1=757711&r2=757712&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFMetadata.java Tue Mar
24 10:46:59 2009
@@ -59,9 +59,8 @@
}
/** {...@inheritdoc} */
- protected void setupFilterList() {
- addDefaultFilter(PDFFilterList.METADATA_FILTER);
- super.setupFilterList();
+ protected String getDefaultFilterName() {
+ return PDFFilterList.METADATA_FILTER;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
