You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2004/02/03 23:10:39 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo FOTreeBuilder.java FOPropertyMapping.java
jeremias 2004/02/03 14:10:39
Modified: src/java/org/apache/fop/fo FOTreeBuilder.java
FOPropertyMapping.java
Log:
Style fixes only.
Revision Changes Path
1.21 +1 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FOTreeBuilder.java 26 Dec 2003 22:11:17 -0000 1.20
+++ FOTreeBuilder.java 3 Feb 2004 22:10:39 -0000 1.21
@@ -220,7 +220,7 @@
* 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);
}
1.9 +18 -14 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FOPropertyMapping.java 2 Feb 2004 16:08:24 -0000 1.8
+++ FOPropertyMapping.java 3 Feb 2004 22:10:39 -0000 1.9
@@ -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 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 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 @@
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 @@
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 @@
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 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org