From: Vincent Hennebert <vhennebert@apache.org>
Date: Thu, 30 Jan 2014 21:35:49 +0000 (+0000)
Subject: Fixed Checkstyle issues
X-Git-Tag: fop-2_0~136^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a4d5aac4e5926a2d94d70e1d71b06d26c1996184;p=xmlgraphics-fop.git

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 ccb4cc678..e05bc007c 100644
--- 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 959adc9a1..e94c8e404 100644
--- 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 52f18bb5e..efef464bd 100644
--- 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 2f5668cbc..ca843ec36 100644
--- 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 c7af068ce..b27dac5b2 100644
--- 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 34cba604a..5c1fb2c86 100644
--- 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.
  */