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 ma...@apache.org on 2009/09/15 17:07:52 UTC
svn commit: r815358 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/
Author: maxberger
Date: Tue Sep 15 15:07:51 2009
New Revision: 815358
URL: http://svn.apache.org/viewvc?rev=815358&view=rev
Log:
equals implementation violated spec -> replaced with new contentEquals function
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFileSpec.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFColor.java Tue Sep 15 15:07:51 2009
@@ -541,13 +541,8 @@
return (new byte[0]);
}
- /**
- * Check for equality of color with another object.
- *
- * @param obj the object to compare
- * @return true if colors are equal
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (!(obj instanceof PDFColor)) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java Tue Sep 15 15:07:51 2009
@@ -526,8 +526,8 @@
private Object findPDFObject(List list, PDFObject compare) {
for (Iterator iter = list.iterator(); iter.hasNext();) {
- Object obj = iter.next();
- if (compare.equals(obj)) {
+ PDFObject obj = (PDFObject) iter.next();
+ if (compare.contentEquals(obj)) {
return obj;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFileSpec.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFileSpec.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFileSpec.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFileSpec.java Tue Sep 15 15:07:51 2009
@@ -63,13 +63,8 @@
* endobj
*/
- /**
- * Check if this equals another object.
- *
- * @param obj the object to compare
- * @return true if this equals other object
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (this == obj) {
return true;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java Tue Sep 15 15:07:51 2009
@@ -696,15 +696,8 @@
}
- /**
- * Check if this function is equal to another object.
- * This is used to find if a particular function already exists
- * in a document.
- *
- * @param obj the obj to compare
- * @return true if the functions are equal
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (obj == null) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGState.java Tue Sep 15 15:07:51 2009
@@ -175,10 +175,8 @@
* endobj
*/
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (obj == this) {
return true;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoTo.java Tue Sep 15 15:07:51 2009
@@ -143,13 +143,8 @@
* endobj
*/
- /**
- * Check if this equals another object.
- *
- * @param obj the object to compare
- * @return true if this equals other object
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (this == obj) {
return true;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFGoToRemote.java Tue Sep 15 15:07:51 2009
@@ -127,13 +127,8 @@
* endobj
*/
- /**
- * Check if this equals another object.
- *
- * @param obj the object to compare
- * @return true if this equals other object
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (this == obj) {
return true;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java Tue Sep 15 15:07:51 2009
@@ -42,13 +42,8 @@
return sb.toString();
}
- /**
- * Check if this equals another object.
- *
- * @param obj the object to compare
- * @return true if this equals other object
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (this == obj) {
return true;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLink.java Tue Sep 15 15:07:51 2009
@@ -106,13 +106,8 @@
* endobj
*/
- /**
- * Check if this equals another object.
- *
- * @param obj the object to compare
- * @return true if this equals other object
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (this == obj) {
return true;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFObject.java Tue Sep 15 15:07:51 2009
@@ -393,4 +393,20 @@
return formatDateTime(time, TimeZone.getDefault());
}
+ /**
+ * Check if the other PDFObject has the same content as the current object.
+ * <p>
+ * Note: This function has a contract which is less binding than
+ * {@link #equals(Object)}. Whereas equals would require all values to be
+ * identical, this method is not required to check everything. In the case
+ * of PDFObjects, this means that the overriding function does not have to
+ * check for {@link #getObjectID()}.
+ *
+ * @param o
+ * object to compare to.
+ * @return true if the other object has the same content.
+ */
+ protected boolean contentEquals(PDFObject o) {
+ return this.equals(o);
+ }
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java Tue Sep 15 15:07:51 2009
@@ -336,13 +336,8 @@
*/
public byte[] toPDF() { return null; }
- /**
- * Check if this pattern is equal to another.
- *
- * @param obj the object to compare against
- * @return true if the patterns are equal
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (obj == null) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java?rev=815358&r1=815357&r2=815358&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java Tue Sep 15 15:07:51 2009
@@ -529,14 +529,8 @@
return (p.toString());
}
- /**
- * Check if this shading is equal to another shading.
- * This is used to check if a shading already exists.
- *
- * @param obj the object to compare against
- * @return true if the shadings are equal
- */
- public boolean equals(Object obj) {
+ /** {@inheritDoc} */
+ protected boolean contentEquals(PDFObject obj) {
if (obj == null) {
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org