From: Jeremias Maerki <jeremias@apache.org>
Date: Tue, 3 Feb 2004 22:10:39 +0000 (+0000)
Subject: Style fixes only.
X-Git-Tag: Root_Temp_KnuthStylePageBreaking~867
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3145d4abcb7e2b137b1f52c7b02bb05042f8e8a5;p=xmlgraphics-fop.git

Style fixes only.


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

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index a24243527..dfdca62ef 100644
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -4,7 +4,7 @@
  *                    The Apache Software License, Version 1.1
  * ============================================================================
  *
- * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ * Copyright (C) 1999-2004 The Apache Software Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
@@ -482,8 +482,9 @@ public class FOPropertyMapping implements Constants {
      */
     public static int getPropertyId(String name) {
         Integer i = (Integer) s_htPropNames.get(name);
-        if (i == null)
+        if (i == null) {
             return -1;
+        }
         return i.intValue();
     }
 
@@ -494,8 +495,9 @@ public class FOPropertyMapping implements Constants {
      */
     public static int getSubPropertyId(String name) {
         Integer i = (Integer) s_htSubPropNames.get(name);
-        if (i == null)
+        if (i == null) {
             return -1;
+        }
         return i.intValue();
     }
     
@@ -1362,8 +1364,8 @@ public class FOPropertyMapping implements Constants {
         pdim = new DimensionPropertyMaker(m);
         pdim.setCorresponding(PR_HEIGHT, PR_HEIGHT, PR_WIDTH);
         pdim.setExtraCorresponding(new int[][] {
-             { PR_MIN_HEIGHT, PR_MIN_HEIGHT, PR_MIN_WIDTH, },
-             { PR_MAX_HEIGHT, PR_MAX_HEIGHT, PR_MAX_WIDTH, }
+             {PR_MIN_HEIGHT, PR_MIN_HEIGHT, PR_MIN_WIDTH, },
+             {PR_MAX_HEIGHT, PR_MAX_HEIGHT, PR_MAX_WIDTH, }
         });
         pdim.setRelative(true);
         addPropertyMaker("block-progression-dimension", m);
@@ -1400,7 +1402,7 @@ public class FOPropertyMapping implements Constants {
         l.setByShorthand(true);
         m.addSubpropMaker(l);
 
-        l= new LengthProperty.Maker(CP_OPTIMUM);
+        l = new LengthProperty.Maker(CP_OPTIMUM);
         l.setDefault("auto");
         l.setAutoOk(true);
         l.setPercentBase(LengthBase.CONTAINING_BOX);
@@ -1418,8 +1420,8 @@ public class FOPropertyMapping implements Constants {
         pdim.setRelative(true);
         pdim.setCorresponding(PR_WIDTH, PR_WIDTH, PR_HEIGHT);
         pdim.setExtraCorresponding(new int[][] {
-			{ PR_MIN_WIDTH, PR_MIN_WIDTH, PR_MIN_HEIGHT, },
-            { PR_MAX_WIDTH, PR_MAX_WIDTH, PR_MAX_HEIGHT, }
+            {PR_MIN_WIDTH, PR_MIN_WIDTH, PR_MIN_HEIGHT, },
+            {PR_MAX_WIDTH, PR_MAX_WIDTH, PR_MAX_HEIGHT, }
         });
         addPropertyMaker("inline-progression-dimension", m);
 
@@ -1549,15 +1551,17 @@ public class FOPropertyMapping implements Constants {
                     return null;
                 }
                 int correspondingValue = corresponding.getEnum();
-                if (correspondingValue == JUSTIFY)
+                if (correspondingValue == JUSTIFY) {
                     return new EnumProperty(START);
-                else if (correspondingValue == END)
+                } else if (correspondingValue == END) {
                     return new EnumProperty(END);
-                else if (correspondingValue == START)
+                } else if (correspondingValue == START) {
                     return new EnumProperty(START);
-                else if (correspondingValue == CENTER)
+                } else if (correspondingValue == CENTER) {
                     return new EnumProperty(CENTER);
-                return null;
+                } else {
+                    return null;
+                }
             }
         };
         m.setInherited(true);
diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java
index a3e4f993f..a988ad979 100644
--- a/src/java/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java
@@ -220,7 +220,7 @@ public class FOTreeBuilder extends DefaultHandler {
      * SAX Handler for characters
      * @see org.xml.sax.ContentHandler#characters(char[], int, int)
      */
-    public void characters(char data[], int start, int length) {
+    public void characters(char[] data, int start, int length) {
         if (currentFObj != null) {
             currentFObj.addCharacters(data, start, start + length, locator);
         }