Author: phancock
Date: Tue Jul 3 16:20:48 2012
New Revision: 1356814
URL: http://svn.apache.org/viewvc?rev=1356814&view=rev
Log:
Fixed merge error
Modified:
xmlgraphics/fop/branches/Temp_RoundedCorners/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
Modified:
xmlgraphics/fop/branches/Temp_RoundedCorners/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_RoundedCorners/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java?rev=1356814&r1=1356813&r2=1356814&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_RoundedCorners/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
(original)
+++
xmlgraphics/fop/branches/Temp_RoundedCorners/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
Tue Jul 3 16:20:48 2012
@@ -29,6 +29,7 @@ import org.w3c.dom.Document;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontTriplet;
import org.apache.fop.render.RenderingContext;
+import org.apache.fop.traits.BorderProps;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
@@ -76,6 +77,13 @@ public class AbstractIFPainterTestCase {
public void drawText(int x, int y, int letterSpacing, int
wordSpacing, int[][] dp,
String text) throws IFException {
}
+
+ public void clipBackground(Rectangle rect, BorderProps bpsBefore,
+ BorderProps bpsAfter, BorderProps bpsStart,
+ BorderProps bpsEnd) throws IFException {
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException();
+ }
};
FontInfo fontInfo = mock(FontInfo.class);
when(handler.getFontInfo()).thenReturn(fontInfo);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
