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 pb...@apache.org on 2004/01/05 05:01:09 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties FontStretch.java RuleStyle.java WritingMode.java Margin.java PageBreakCommon.java BackgroundPosition.java TextDecoration.java FontSize.java RegionName.java CaptionSide.java BreakCommon.java WhiteSpaceTreatment.java AlignmentAdjust.java TextAlign.java BorderStyle.java ForcePageCount.java VerticalAlign.java ColorCommon.java Font.java ColorNonTransparent.java BorderColor.java Background.java ActiveState.java Float.java AlignmentBaseline.java DominantBaseline.java FontWeight.java BorderWidth.java BorderCommonWidth.java BorderCommonStyle.java TextAlignLast.java
pbwest 2004/01/04 20:01:09
Modified: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design FontStretch.java
RuleStyle.java WritingMode.java Margin.java
PageBreakCommon.java BackgroundPosition.java
TextDecoration.java FontSize.java RegionName.java
CaptionSide.java BreakCommon.java
WhiteSpaceTreatment.java AlignmentAdjust.java
TextAlign.java BorderStyle.java ForcePageCount.java
VerticalAlign.java ColorCommon.java Font.java
ColorNonTransparent.java BorderColor.java
Background.java ActiveState.java Float.java
AlignmentBaseline.java DominantBaseline.java
FontWeight.java BorderWidth.java
BorderCommonWidth.java BorderCommonStyle.java
TextAlignLast.java
Log:
Removed redundant casts.
Flagged by Eclipse.
Revision Changes Path
No revision
No revision
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontStretch.java
Index: FontStretch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontStretch.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontStretch.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ FontStretch.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -121,8 +121,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/RuleStyle.java
Index: RuleStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/RuleStyle.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RuleStyle.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ RuleStyle.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -109,8 +109,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WritingMode.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ WritingMode.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -109,8 +109,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Margin.java
Index: Margin.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Margin.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Margin.java 3 Jan 2004 10:48:33 -0000 1.1.2.2
+++ Margin.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -182,7 +182,7 @@
* @return <tt>PropertyValue</t> the same value, with its property set
* to the <i>property</i> argument, if it is an Auto or a
* <tt>Numeric</tt> distance
- * @exception <tt>PropertyException</tt> if the conditions are not met
+ * @exception PropertyException if the conditions are not met
*/
private static PropertyValue autoOrDistance
(PropertyValue value, int property)
@@ -202,7 +202,7 @@
* @param value <tt>PropertyValue</tt> the value being tested
* @return <tt>PropertyValue</t> the same value if it is an Auto or a
* <tt>Numeric</tt> distance
- * @exception <tt>PropertyException</tt> if the conditions are not met
+ * @exception PropertyException if the conditions are not met
*/
private static PropertyValue autoOrDistance(PropertyValue value)
throws PropertyException
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/PageBreakCommon.java
Index: PageBreakCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/PageBreakCommon.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PageBreakCommon.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ PageBreakCommon.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -108,8 +108,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +6 -7 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BackgroundPosition.java
Index: BackgroundPosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BackgroundPosition.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundPosition.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ BackgroundPosition.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -150,14 +150,13 @@
/**
* Do the work for the three argument refineParsing method.
- * @param propindex - the <tt>int</tt> property index.
- * @param foNode - the <tt>FONode</tt> being built
+ * @param propindex the property index.
+ * @param foNode the FONode being built
* @param value <tt>PropertyValue</tt> returned by the parser
- * @param nested <tt>boolean</tt> indicating whether this method is
+ * @param nested indicates whether this method is
* called normally (false), or as part of another <i>refineParsing</i>
- * method.
- * @return <tt>PropertyValue</tt> the verified value
- * @see #refineParsing(FOTree,PropertyValue)
+ * method
+ * @return the verified <tt>PropertyValue</tt>
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
1.1.2.4 +2 -2 xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextDecoration.java
Index: TextDecoration.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextDecoration.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- TextDecoration.java 3 Jan 2004 10:48:35 -0000 1.1.2.3
+++ TextDecoration.java 5 Jan 2004 04:01:09 -0000 1.1.2.4
@@ -158,7 +158,7 @@
}
} else { // list is a PropertyValueList
ssList = spaceSeparatedList((PropertyValueList)list);
- iter = ((PropertyValueList)ssList).iterator();
+ iter = ssList.iterator();
while (iter.hasNext()) {
Object value = iter.next();
if (value instanceof NCName)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontSize.java
Index: FontSize.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontSize.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontSize.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ FontSize.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -148,8 +148,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/RegionName.java
Index: RegionName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/RegionName.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionName.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ RegionName.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -103,8 +103,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/CaptionSide.java
Index: CaptionSide.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/CaptionSide.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CaptionSide.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ CaptionSide.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -116,8 +116,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BreakCommon.java
Index: BreakCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BreakCommon.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BreakCommon.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ BreakCommon.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -74,8 +74,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/WhiteSpaceTreatment.java
Index: WhiteSpaceTreatment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WhiteSpaceTreatment.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WhiteSpaceTreatment.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ WhiteSpaceTreatment.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -107,8 +107,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/AlignmentAdjust.java
Index: AlignmentAdjust.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/AlignmentAdjust.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AlignmentAdjust.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ AlignmentAdjust.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -113,8 +113,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextAlign.java
Index: TextAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextAlign.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextAlign.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ TextAlign.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -115,8 +115,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +1 -2 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStyle.java
Index: BorderStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderStyle.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderStyle.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ BorderStyle.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -129,7 +129,6 @@
* called normally (false), or as part of another <i>refineParsing</i>
* method.
* @return <tt>PropertyValue</tt> the verified value
- * @see #refineParsing(FONode,PropertyValue)
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/ForcePageCount.java
Index: ForcePageCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ForcePageCount.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ForcePageCount.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ ForcePageCount.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -100,8 +100,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/VerticalAlign.java
Index: VerticalAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/VerticalAlign.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- VerticalAlign.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ VerticalAlign.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -114,8 +114,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.2 +3 -4 xml-fop/src/java/org/apache/fop/fo/properties/Attic/ColorCommon.java
Index: ColorCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ColorCommon.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ColorCommon.java 5 Jul 2003 19:22:25 -0000 1.1.2.1
+++ ColorCommon.java 5 Jan 2004 04:01:09 -0000 1.1.2.2
@@ -109,11 +109,11 @@
* The argument must be either a ColorType already, in which case
* it is returned unchanged, or an NCName whose string value is a
* standard color or 'transparent'.
- * @param propindex the index of the property to which this value is
+ * @param property the index of the property to which this value is
* being applied.
* @param value <tt>PropertyValue</tt>
* @return <tt>ColorValue</tt> equivalent of the argument
- * @exception <tt>PropertyException</tt>
+ * @exception PropertyException
*/
protected static ColorType getColor(int property, PropertyValue value)
throws PropertyException
@@ -185,7 +185,6 @@
* called normally (false), or as part of another <i>refineParsing</i>
* method.
* @return <tt>PropertyValue</tt> the verified value
- * @see #refineParsing(FONode,PropertyValue)
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Font.java
Index: Font.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Font.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Font.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ Font.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -118,8 +118,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
@@ -349,7 +349,7 @@
* @return <tt>PropertyValueList</tt> containing a
* <tt>PropertyValue</tt> for each property in the expansion of the
* shorthand.
- * @exception PropertyValueException
+ * @exception PropertyException
*/
private static PropertyValueList
processSpaceSepList(FONode foNode,
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java
Index: ColorNonTransparent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ColorNonTransparent.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ ColorNonTransparent.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -69,8 +69,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length - 1; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
rwEnumHash.put("grey", Ints.consts.get(ColorCommon.GRAY));
}
1.1.2.3 +1 -2 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColor.java
Index: BorderColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderColor.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderColor.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ BorderColor.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -130,7 +130,6 @@
* called normally (false), or as part of another <i>refineParsing</i>
* method.
* @return <tt>PropertyValue</tt> the verified value
- * @see #refineParsing(FONode,PropertyValue)
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
1.1.2.4 +5 -6 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Background.java
Index: Background.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Background.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Background.java 3 Jan 2004 10:48:35 -0000 1.1.2.3
+++ Background.java 5 Jan 2004 04:01:09 -0000 1.1.2.4
@@ -127,10 +127,9 @@
* @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> on which this expression is being
* parsed.
- * @value - the <tt>PropertyValue</tt> passed from
- * <i>PropertyParser.parse()</i>.
- * @return the refined <tt>PropertyValue</tt>.
- * @throws <tt>PropertyException</tt>.
+ * @param value passed from <i>PropertyParser.parse()</i>
+ * @return the refined <tt>PropertyValue</tt>
+ * @throws PropertyException
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
@@ -184,7 +183,7 @@
if (value.size() == 0)
throw new PropertyException
("Empty list for Background");
- ListIterator elements = ((PropertyValueList)value).listIterator();
+ ListIterator elements = value.listIterator();
scanning_elements: while (elements.hasNext()) {
PropertyValue pval = (PropertyValue)(elements.next());
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/ActiveState.java
Index: ActiveState.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/ActiveState.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ActiveState.java 3 Jan 2004 10:48:35 -0000 1.1.2.2
+++ ActiveState.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -100,8 +100,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Float.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Float.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ Float.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -100,8 +100,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/AlignmentBaseline.java
Index: AlignmentBaseline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/AlignmentBaseline.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AlignmentBaseline.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ AlignmentBaseline.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -112,8 +112,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/DominantBaseline.java
Index: DominantBaseline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/DominantBaseline.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DominantBaseline.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ DominantBaseline.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -111,8 +111,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +1 -2 xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontWeight.java
Index: FontWeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontWeight.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontWeight.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ FontWeight.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -124,7 +124,6 @@
* called normally (false), or as part of another <i>refineParsing</i>
* method.
* @return <tt>PropertyValue</tt> the verified value
- * @see #refineParsing(FONode,PropertyValue)
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
1.1.2.3 +1 -2 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderWidth.java
Index: BorderWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderWidth.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderWidth.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ BorderWidth.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -137,7 +137,6 @@
* called normally (false), or as part of another <i>refineParsing</i>
* method.
* @return <tt>PropertyValue</tt> the verified value
- * @see #refineParsing(FONode,PropertyValue)
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
1.1.2.2 +4 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java
Index: BorderCommonWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderCommonWidth.java 5 Jul 2003 19:22:22 -0000 1.1.2.1
+++ BorderCommonWidth.java 5 Jan 2004 04:01:09 -0000 1.1.2.2
@@ -83,8 +83,9 @@
// terms must be manually changed.
/**
- * @param <tt>int</tt> property index
- * @param <tt>int</tt> mappedEnum enumeration value
+ * @param node the FONode with an expressing the property
+ * @param property the property index
+ * @param enum the mappedEnum enumeration value
* @return <tt>Numeric[]</tt> containing the values corresponding
* to the MappedNumeric enumeration constants for border width
*/
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java
Index: BorderCommonStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCommonStyle.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ BorderCommonStyle.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -88,8 +88,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextAlignLast.java
Index: TextAlignLast.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextAlignLast.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextAlignLast.java 3 Jan 2004 10:48:34 -0000 1.1.2.2
+++ TextAlignLast.java 5 Jan 2004 04:01:09 -0000 1.1.2.3
@@ -117,8 +117,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i < rwEnums.length; i++ ) {
- rwEnumHash.put((Object)rwEnums[i],
- (Object) Ints.consts.get(i));
+ rwEnumHash.put(rwEnums[i],
+ Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org