Author: vhennebert
Date: Thu Jan 30 21:35:49 2014
New Revision: 1562983
URL: http://svn.apache.org/r1562983
Log:
Fixed Checkstyle issues
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/OperatorValidator.java
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/src/java/org/apache/fop/render/afp/AFPSVGHandler.java?rev=1562983&r1=1562982&r2=1562983&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_FopFontsForSVG/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_FopFontsForSVG/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
Thu Jan 30 21:35:49 2014
@@ -200,8 +200,9 @@ public class AFPSVGHandler extends Abstr
public static BridgeContext createBridgeContext(FOUserAgent userAgent,
AFPGraphics2D g2d) {
ImageManager imageManager = userAgent.getImageManager();
FontInfo fontInfo = g2d.getFontInfo();
- SVGUserAgent svgUserAgent = new SVGUserAgent(userAgent, new
AggregatingFontFamilyResolver(
- new AFPFontFamilyResolver(fontInfo,
userAgent.getEventBroadcaster()), DefaultFontFamilyResolver.SINGLETON),
+ SVGUserAgent svgUserAgent = new SVGUserAgent(userAgent,
+ new AggregatingFontFamilyResolver(new
AFPFontFamilyResolver(fontInfo, userAgent.getEventBroadcaster()),
+ DefaultFontFamilyResolver.SINGLETON),
new AffineTransform());
ImageSessionContext imageSessionContext =
userAgent.getImageSessionContext();
return new AFPBridgeContext(svgUserAgent, fontInfo, imageManager,
imageSessionContext,
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/OperatorValidator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/OperatorValidator.java?rev=1562983&r1=1562982&r2=1562983&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/OperatorValidator.java
(original)
+++
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/OperatorValidator.java
Thu Jan 30 21:35:49 2014
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTru
class OperatorValidator {
- private static interface Match {
+ private interface Match {
boolean match(String line);
}
@@ -60,7 +60,7 @@ class OperatorValidator {
public boolean match(String line) {
boolean match = currentMatch.match(line);
if (match) {
- if(expectedMatches.isEmpty()) {
+ if (expectedMatches.isEmpty()) {
currentMatch = FINAL_MATCH;
} else {
currentMatch = expectedMatches.remove();
@@ -105,4 +105,4 @@ class OperatorValidator {
assertTrue("Expected operators remain", matchSequence.isExhausted());
}
-}
\ No newline at end of file
+}
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java?rev=1562983&r1=1562982&r2=1562983&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
(original)
+++
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
Thu Jan 30 21:35:49 2014
@@ -30,7 +30,6 @@ import org.apache.xmlgraphics.java2d.Gra
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.pdf.PDFDocument;
-import org.apache.fop.svg.font.FOPFontFamilyResolverImpl;
public class PDFTextPainterTestCase extends NativeTextPainterTest {
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java?rev=1562983&r1=1562982&r2=1562983&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
(original)
+++
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
Thu Jan 30 21:35:49 2014
@@ -33,17 +33,17 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.apache.batik.gvt.font.GVTFontFamily;
-import org.apache.batik.gvt.font.GVTLineMetrics;
-
-import org.apache.fop.fonts.FontInfo;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.apache.batik.gvt.font.GVTFontFamily;
+import org.apache.batik.gvt.font.GVTLineMetrics;
+
+import org.apache.fop.fonts.FontInfo;
+
public class FOPFontFamilyResolverTestCase {
private static FontInfo fontInfo;
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java?rev=1562983&r1=1562982&r2=1562983&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
(original)
+++
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
Thu Jan 30 21:35:49 2014
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.fop.fonts.Font;
-import org.apache.fop.svg.font.FOPGVTFont;
public class FOPGVTFontTestCase {
Modified:
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java?rev=1562983&r1=1562982&r2=1562983&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
(original)
+++
xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
Thu Jan 30 21:35:49 2014
@@ -23,10 +23,10 @@ import java.util.Collections;
import org.junit.Test;
-import org.apache.fop.fonts.FontInfo;
-
import static org.junit.Assert.assertEquals;
+import org.apache.fop.fonts.FontInfo;
+
/**
* Specifically tests glyph positioning from a real font.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
