From 9826acf1e8c3552abc295ba34384292ae6db51b3 Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Fri, 2 Mar 2012 21:34:30 +0000 Subject: enable MultipleVariableDeclarations rule; fix violations git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1296483 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/expr/ICCColorFunction.java | 4 +++- src/java/org/apache/fop/fo/expr/NamedColorFunction.java | 4 +++- src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src/java/org/apache/fop/fo/expr') diff --git a/src/java/org/apache/fop/fo/expr/ICCColorFunction.java b/src/java/org/apache/fop/fo/expr/ICCColorFunction.java index eaf932961..756de1b20 100644 --- a/src/java/org/apache/fop/fo/expr/ICCColorFunction.java +++ b/src/java/org/apache/fop/fo/expr/ICCColorFunction.java @@ -79,7 +79,9 @@ class ICCColorFunction extends FunctionBase { } String src = (cp != null ? cp.getSrc() : ""); - float red = 0, green = 0, blue = 0; + float red = 0; + float green = 0; + float blue = 0; red = args[0].getNumber().floatValue(); green = args[1].getNumber().floatValue(); blue = args[2].getNumber().floatValue(); diff --git a/src/java/org/apache/fop/fo/expr/NamedColorFunction.java b/src/java/org/apache/fop/fo/expr/NamedColorFunction.java index e4f8bc643..f2ff19ef1 100644 --- a/src/java/org/apache/fop/fo/expr/NamedColorFunction.java +++ b/src/java/org/apache/fop/fo/expr/NamedColorFunction.java @@ -66,7 +66,9 @@ class NamedColorFunction extends FunctionBase { throw pe; } - float red = 0, green = 0, blue = 0; + float red = 0; + float green = 0; + float blue = 0; red = args[0].getNumber().floatValue(); green = args[1].getNumber().floatValue(); blue = args[2].getNumber().floatValue(); diff --git a/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java b/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java index 883070056..10fde01b6 100644 --- a/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java +++ b/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java @@ -223,7 +223,8 @@ public class RelativeNumericProperty extends Property implements Length { * specification. */ public double getTableUnits() { - double tu1 = 0.0, tu2 = 0.0; + double tu1 = 0.0; + double tu2 = 0.0; if (op1 instanceof RelativeNumericProperty) { tu1 = ((RelativeNumericProperty) op1).getTableUnits(); } else if (op1 instanceof TableColLength) { -- cgit v1.2.3