Fixed Checkstyle issues

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_FopFontsForSVG@1562983 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
index ccb4cc678e7c2ba667eec10427c31550d093f79f..e05bc007ca1260248b38525fe0c613cabf61e313 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
+++ b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java
@@ -200,8 +200,9 @@ public class AFPSVGHandler extends AbstractGenericSVGHandler {
     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,

diff --git a/test/java/org/apache/fop/svg/OperatorValidator.java b/test/java/org/apache/fop/svg/OperatorValidator.java
index 959adc9a1f0fb18146ea1e9f421f46a96a2e6d30..e94c8e404d86b83b64307ae35087197457d61bc1 100644 (file)
--- a/test/java/org/apache/fop/svg/OperatorValidator.java
+++ b/test/java/org/apache/fop/svg/OperatorValidator.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTrue;
 
 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
+}

diff --git a/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java b/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
index 52f18bb5e08fcb98bc8420f8a0d694c101483a16..efef464bdcd37b64830d2ee696602aab5f557b01 100644 (file)
--- a/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
+++ b/test/java/org/apache/fop/svg/PDFTextPainterTestCase.java
@@ -30,7 +30,6 @@ import org.apache.xmlgraphics.java2d.GraphicContext;
 
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.pdf.PDFDocument;
-import org.apache.fop.svg.font.FOPFontFamilyResolverImpl;
 
 public class PDFTextPainterTestCase extends NativeTextPainterTest {
 

diff --git a/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java b/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
index 2f5668cbc551414936572727f6a85858a8198c85..ca843ec366f8ea2d4194fa203513db5c1cf4fb0d 100644 (file)
--- a/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
+++ b/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
@@ -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;

diff --git a/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java b/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
index c7af068ceb6ff877f04085ec350ed1806f364918..b27dac5b2d7ace4a308252bf40b3693172ec5299 100644 (file)
--- a/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
+++ b/test/java/org/apache/fop/svg/font/FOPGVTFontTestCase.java
@@ -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 {
 

diff --git a/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java b/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
index 34cba604a076aa2f62c7b361535ae9ab537037bf..5c1fb2c862af83b6619b3f2c1d1d599b81f84e3c 100644 (file)
--- a/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
+++ b/test/java/org/apache/fop/svg/font/GlyphLayoutTestCase.java
@@ -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.
  */