aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fo/FOPropertyMapping.java
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2004-02-03 22:10:39 +0000
committerJeremias Maerki <jeremias@apache.org>2004-02-03 22:10:39 +0000
commit3145d4abcb7e2b137b1f52c7b02bb05042f8e8a5 (patch)
tree49ec4dc6e5b8f931ac251fa5a46c1182f064bd5c /src/java/org/apache/fop/fo/FOPropertyMapping.java
parentfb6721590e23b6af855bd69222a86cf20326be6d (diff)
downloadxmlgraphics-fop-3145d4abcb7e2b137b1f52c7b02bb05042f8e8a5.tar.gz
xmlgraphics-fop-3145d4abcb7e2b137b1f52c7b02bb05042f8e8a5.zip
Style fixes only.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197319 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo/FOPropertyMapping.java')
-rw-r--r--src/java/org/apache/fop/fo/FOPropertyMapping.java30
1 files changed, 17 insertions, 13 deletions
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);