User: kz Date: 2008-03-05 17:31:26+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED 2008/02/21 09:57:23 oj 1.2.70.1: #i85225# fixes found with PMD File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: FormatValueUtility.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java?r1=1.2&r2=1.3 Delta lines: +103 -106 ----------------------- --- FormatValueUtility.java 2007-07-09 11:56:05+0000 1.2 +++ FormatValueUtility.java 2008-03-05 17:31:24+0000 1.3 @@ -21,6 +21,10 @@ */ public class FormatValueUtility { + private static final String BOOLEAN_VALUE = "boolean-value"; + private static final String STRING_VALUE = "string-value"; + + private static final String VALUE_TYPE = "value-type"; private static SimpleDateFormat dateFormat; private FormatValueUtility() @@ -31,71 +35,66 @@ { if (value instanceof Date) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value-type", "date"); - variableSection.setAttribute - (OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "date"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); } else if (value instanceof Number) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value-type", "float"); - variableSection.setAttribute - (OfficeNamespaces.OFFICE_NS, "value", String.valueOf(value)); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "float"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value", String.valueOf(value)); } else if (value instanceof Boolean) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value-type", "boolean"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "boolean"); if (Boolean.TRUE.equals(value)) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "boolean-value", "true"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,BOOLEAN_VALUE, "true"); } else { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "boolean-value", "false"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,BOOLEAN_VALUE, "false"); } } else if (value != null) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value-type", "string"); - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "string-value", String.valueOf(value)); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "string"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,STRING_VALUE, String.valueOf(value)); } else { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value-type", "string"); - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "string-value", ""); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE_TYPE, "string"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,STRING_VALUE, ""); } } - public static void applyValueForCell(final Object value, final AttributeMap variableSection) { if (value instanceof Date) { - variableSection.setAttribute - (OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); } else if (value instanceof Number) { - variableSection.setAttribute - (OfficeNamespaces.OFFICE_NS, "value", String.valueOf(value)); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "value", String.valueOf(value)); } else if (value instanceof Boolean) { if (Boolean.TRUE.equals(value)) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "boolean-value", "true"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,BOOLEAN_VALUE, "true"); } else { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "boolean-value", "false"); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,BOOLEAN_VALUE, "false"); } } else if (value != null) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "string-value", String.valueOf(value)); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,STRING_VALUE, String.valueOf(value)); } else { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "string-value", ""); + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,STRING_VALUE, ""); } } @@ -115,8 +114,7 @@ // here it is relatively easy. We have to evaluate the expression, convert // the result into a string, and print that string. final FormulaExpression formulaExpression = element.getValueExpression(); - final Object result = LayoutControllerUtil.evaluateExpression - (flowController, element, formulaExpression); + final Object result = LayoutControllerUtil.evaluateExpression(flowController, element, formulaExpression); if (result == null) { // ignore it. Ignoring it is much better than printing 'null'. @@ -132,5 +130,4 @@ return new DefaultDataFlags(null, result, true); } } - } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
